This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 24784eb80b pre-commit autofix `.mm` files (#353)
24784eb80b is described below
commit 24784eb80b61bc1709c3e7f636228090e1d3f93c
Author: John Bampton <[email protected]>
AuthorDate: Wed Apr 2 02:45:20 2025 +1000
pre-commit autofix `.mm` files (#353)
* pre-commit autofix `.mm` files
Enforced 3 hooks:
- end-of-file-fixer
- mixed-line-ending
- trailing-whitespace
* Update aqua11yfactory.mm
---------
Co-authored-by: Matthias Seidel <[email protected]>
---
.pre-commit-config.yaml | 6 +-
main/sfx2/source/appl/shutdowniconaqua.mm | 56 +++---
main/vcl/aqua/source/a11y/aqua11yactionwrapper.mm | 8 +-
.../aqua/source/a11y/aqua11ycomponentwrapper.mm | 22 +--
main/vcl/aqua/source/a11y/aqua11yfactory.mm | 20 +--
main/vcl/aqua/source/a11y/aqua11yrolehelper.mm | 10 +-
.../aqua/source/a11y/aqua11yselectionwrapper.mm | 18 +-
main/vcl/aqua/source/a11y/aqua11ytablewrapper.mm | 34 ++--
.../source/a11y/aqua11ytextattributeswrapper.mm | 16 +-
main/vcl/aqua/source/a11y/aqua11ytextwrapper.mm | 44 ++---
main/vcl/aqua/source/a11y/aqua11yutil.mm | 8 +-
main/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm | 14 +-
main/vcl/aqua/source/a11y/aqua11ywrapper.mm | 72 ++++----
main/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm | 8 +-
.../vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm | 8 +-
.../vcl/aqua/source/a11y/aqua11ywrappercombobox.mm | 24 +--
main/vcl/aqua/source/a11y/aqua11ywrappergroup.mm | 14 +-
main/vcl/aqua/source/a11y/aqua11ywrapperlist.mm | 8 +-
.../aqua/source/a11y/aqua11ywrapperradiobutton.mm | 8 +-
.../aqua/source/a11y/aqua11ywrapperradiogroup.mm | 8 +-
main/vcl/aqua/source/a11y/aqua11ywrapperrow.mm | 8 +-
.../aqua/source/a11y/aqua11ywrapperscrollarea.mm | 16 +-
.../aqua/source/a11y/aqua11ywrapperscrollbar.mm | 8 +-
.../vcl/aqua/source/a11y/aqua11ywrappersplitter.mm | 8 +-
.../aqua/source/a11y/aqua11ywrapperstatictext.mm | 8 +-
.../vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm | 16 +-
.../vcl/aqua/source/a11y/aqua11ywrappertextarea.mm | 8 +-
main/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm | 12 +-
main/vcl/aqua/source/app/salnstimer.mm | 11 +-
main/vcl/aqua/source/app/vclnsapp.mm | 57 +++---
main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 194 ++++++++++-----------
main/vcl/aqua/source/gdi/aquaprintview.mm | 10 +-
main/vcl/aqua/source/window/salframeview.mm | 29 ++-
main/vcl/aqua/source/window/salnsmenu.mm | 24 ++-
34 files changed, 405 insertions(+), 410 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3f6c7b5421..1455018bc4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,12 +33,12 @@ repos:
- id: check-merge-conflict
- id: check-vcs-permalinks
- id: end-of-file-fixer
- files:
(m|M)akefile$|\.(asp|bat|c|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|m|md|mk|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xml|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$
+ files:
(m|M)akefile$|\.(asp|bat|c|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|m|md|mk|mm|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xml|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$
- id: fix-byte-order-marker
- id: mixed-line-ending
- files:
^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|dxp|el|h|hrc|idl|in|ini|m|md|mk|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$
+ files:
^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|dxp|el|h|hrc|idl|in|ini|m|md|mk|mm|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$
- id: trailing-whitespace
- files:
\.(asp|bat|el|hrc|in|ini|m|pas|php|pl|pm|rc|sh|xcs|xdl|xmi|xsd|ya?ml)$
+ files:
\.(asp|bat|el|hrc|in|ini|m|mm|pas|php|pl|pm|rc|sh|xcs|xdl|xmi|xsd|ya?ml)$
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
hooks:
diff --git a/main/sfx2/source/appl/shutdowniconaqua.mm
b/main/sfx2/source/appl/shutdowniconaqua.mm
index 3d9c5d0b16..8aee8b7e17 100644
--- a/main/sfx2/source/appl/shutdowniconaqua.mm
+++ b/main/sfx2/source/appl/shutdowniconaqua.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -187,12 +187,12 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1< ::com::sun::star
int nItems = [menu numberOfItems];
while( nItems -- )
[menu removeItemAtIndex: 0];
-
+
// update recent item list
Sequence< Sequence< PropertyValue > > aHistoryList(
SvtHistoryOptions().GetList( ePICKLIST ) );
int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 :
aHistoryList.getLength();
-
+
m_pRecentFilesItems->clear();
if( ( nPickListMenuItems > 0 ) )
{
@@ -200,11 +200,11 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1< ::com::sun::star
{
Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
RecentMenuEntry aRecentFile;
-
+
for ( int j = 0; j < rPickListEntry.getLength(); j++ )
{
Any a = rPickListEntry[j].Value;
-
+
if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
a >>= aRecentFile.aURL;
else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_FILTER )
@@ -214,7 +214,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1< ::com::sun::star
else if ( rPickListEntry[j].Name ==
HISTORY_PROPERTYNAME_PASSWORD )
a >>= aRecentFile.aPassword;
}
-
+
m_pRecentFilesItems->push_back( aRecentFile );
}
}
@@ -224,16 +224,16 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1< ::com::sun::star
{
rtl::OUString aMenuTitle;
INetURLObject aURL( (*m_pRecentFilesItems)[i].aURL );
-
+
if ( aURL.GetProtocol() == INET_PROT_FILE )
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
String aFileSystemPath( aURL.getFSysPath(
INetURLObject::FSYS_DETECT ) );
-
+
::rtl::OUString aSystemPath( aFileSystemPath );
::rtl::OUString aCompactedSystemPath;
-
+
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData,
&aCompactedSystemPath.pData, 46, NULL );
if ( !nError )
aMenuTitle = String( aCompactedSystemPath );
@@ -246,7 +246,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1< ::com::sun::star
Reference< XStringWidth > xStringLength( new
RecentFilesStringLength() );
aMenuTitle = aURL.getAbbreviated( xStringLength, 46,
INetURLObject::DECODE_UNAMBIGUOUS );
}
-
+
NSMenuItem* pNewItem = [[NSMenuItem alloc] initWithTitle:
getAutoreleasedString( aMenuTitle )
action:
@selector(executeRecentEntry:)
keyEquivalent: @""];
@@ -266,7 +266,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper1< ::com::sun::star
const RecentMenuEntry& rRecentFile = (*m_pRecentFilesItems)[ nIndex ];
int NUM_OF_PICKLIST_ARGS = 3;
Sequence< PropertyValue > aArgsList( NUM_OF_PICKLIST_ARGS );
-
+
aArgsList[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"Referer" ));
aArgsList[0].Value = makeAny( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
@@ -315,14 +315,14 @@ static rtl::OUString getShortCut( const rtl::OUString
i_rTitle )
}
}
- return aKeyEquiv;
+ return aKeyEquiv;
}
static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const
rtl::OUString& i_rTitle, int i_nTag, const rtl::OUString& i_rKeyEquiv )
{
if( ! i_rTitle.getLength() )
return;
-
+
NSMenuItem* pItem = [[NSMenuItem alloc] initWithTitle:
getAutoreleasedString( i_rTitle )
action: @selector(executeMenuItem:)
keyEquivalent:
(i_rKeyEquiv.getLength() ? getAutoreleasedString( i_rKeyEquiv ) : @"")
@@ -350,7 +350,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu*
i_pDockMenu, const String
{
if( ! pRecentDelegate )
pRecentDelegate = [[RecentMenuDelegate alloc] init];
-
+
NSMenuItem* pItem = [i_pMenu addItemWithTitle: getAutoreleasedString(
i_rTitle )
action:
@selector(executeMenuItem:)
keyEquivalent: @""
@@ -391,13 +391,13 @@ void aqua_init_systray()
// disable shutdown
pShutdownIcon->SetVeto( true );
pShutdownIcon->addTerminateListener();
-
+
if( ! pDefMenu )
{
if( [NSApp respondsToSelector: @selector(addFallbackMenuItem:)] )
{
aShortcuts.clear();
-
+
pExecute = [[QSMenuExecute alloc] init];
pDefMenu = [[NSMenuItem alloc] initWithTitle:
getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )
action: NULL keyEquivalent: @""];
pDockSubMenu = [[NSMenuItem alloc] initWithTitle:
getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )
action: NULL keyEquivalent: @""];
@@ -405,14 +405,14 @@ void aqua_init_systray()
[pMenu setAutoenablesItems: NO];
NSMenu* pDockMenu = [[NSMenu alloc] initWithTitle:
getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )];
[pDockMenu setAutoenablesItems: NO];
-
+
// collect the URLs of the entries in the File/New menu
SvtModuleOptions aModuleOptions;
std::set< rtl::OUString > aFileNewAppsAvailable;
SvtDynamicMenuOptions aOpt;
Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu(
E_NEWMENU );
const rtl::OUString sURLKey( RTL_CONSTASCII_USTRINGPARAM( "URL" )
);
-
+
const Sequence< PropertyValue >* pNewMenu =
aNewMenu.getConstArray();
const Sequence< PropertyValue >* pNewMenuEnd =
aNewMenu.getConstArray() + aNewMenu.getLength();
for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu )
@@ -422,7 +422,7 @@ void aqua_init_systray()
if ( sURL.getLength() )
aFileNewAppsAvailable.insert( sURL );
}
-
+
// describe the menu entries for launching the applications
struct MenuEntryDescriptor
{
@@ -449,23 +449,23 @@ void aqua_init_systray()
DBG_ERROR( "setDockIconClickHandler selector failed on
NSApp\n" );
}
-
+
// insert the menu entries for launching the applications
for ( size_t i = 0; i < sizeof( aMenuItems ) / sizeof(
aMenuItems[0] ); ++i )
{
if ( !aModuleOptions.IsModuleInstalled(
aMenuItems[i].eModuleIdentifier ) )
// the complete application is not even installed
continue;
-
+
rtl::OUString sURL( ::rtl::OUString::createFromAscii(
aMenuItems[i].pAsciiURLDescription ) );
-
+
if ( aFileNewAppsAvailable.find( sURL ) ==
aFileNewAppsAvailable.end() )
// the application is installed, but the entry has been
configured to *not* appear in the File/New
// menu => also let not appear it in the quickstarter
continue;
-
+
rtl::OUString aKeyEquiv( getShortCut(
pShutdownIcon->GetUrlDescription( sURL ) ) );
-
+
appendMenuItem( pMenu, pDockMenu,
pShutdownIcon->GetUrlDescription( sURL ), aMenuItems[i].nMenuTag, aKeyEquiv );
}
@@ -480,7 +480,7 @@ void aqua_init_systray()
aTitle = pShutdownIcon->GetResString( STR_QUICKSTART_FILEOPEN );
aKeyEquiv = getShortCut( aTitle );
appendMenuItem( pMenu, pDockMenu, aTitle, MI_OPEN, aKeyEquiv );
-
+
[pDefMenu setSubmenu: pMenu];
[NSApp performSelector:@selector(addFallbackMenuItem:) withObject:
pDefMenu];
diff --git a/main/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
b/main/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
index 4baa5e6f2c..a366961d79 100644
--- a/main/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
b/main/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
index c745fd1ea5..db97fa3455 100644
--- a/main/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -62,11 +62,11 @@ using namespace ::com::sun::star::uno;
+(void)addAttributeNamesTo:(NSMutableArray *)attributeNames {
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
- [ attributeNames addObjectsFromArray: [ NSArray arrayWithObjects:
- NSAccessibilitySizeAttribute,
- NSAccessibilityPositionAttribute,
- NSAccessibilityFocusedAttribute,
- NSAccessibilityEnabledAttribute,
+ [ attributeNames addObjectsFromArray: [ NSArray arrayWithObjects:
+ NSAccessibilitySizeAttribute,
+ NSAccessibilityPositionAttribute,
+ NSAccessibilityFocusedAttribute,
+ NSAccessibilityEnabledAttribute,
nil ] ];
[ pool release ];
}
@@ -74,8 +74,8 @@ using namespace ::com::sun::star::uno;
+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper
*)wrapper {
BOOL isSettable = NO;
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
- if ( [ attribute isEqualToString: NSAccessibilityFocusedAttribute ]
- && ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper
accessibleContext ] ] isEqualToString: NSAccessibilityScrollBarRole ]
+ if ( [ attribute isEqualToString: NSAccessibilityFocusedAttribute ]
+ && ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper
accessibleContext ] ] isEqualToString: NSAccessibilityScrollBarRole ]
&& ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper
accessibleContext ] ] isEqualToString: NSAccessibilityStaticTextRole ] ) {
isSettable = YES;
}
diff --git a/main/vcl/aqua/source/a11y/aqua11yfactory.mm
b/main/vcl/aqua/source/a11y/aqua11yfactory.mm
index 5268ab2199..52708f5b2f 100644
--- a/main/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/main/vcl/aqua/source/a11y/aqua11yfactory.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -52,7 +52,7 @@
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
-static bool enabled = false;
+static bool enabled = false;
@implementation AquaA11yFactory : NSObject
@@ -66,7 +66,7 @@ static bool enabled = false;
// initialize keyboard focus tracker
rtl::Reference< AquaA11yFocusListener > listener(
AquaA11yFocusListener::get() );
AquaA11yFocusTracker::get().setFocusListener(listener.get());
- enabled = true;
+ enabled = true;
}
return mdAllWrapper;
}
@@ -149,13 +149,13 @@ static bool enabled = false;
[ nativeRole release ];
[ aWrapper setActsAsRadioGroup: asRadioGroup ];
#if 0
- /* #i102033# NSAccessibility does not seemt to know an equivalent for
transient children.
+ /* #i102033# NSAccessibility does not seem to know an equivalent for
transient children.
That means we need to cache this, else e.g. tree list boxes are not
accessible (moreover
- it crashes by notifying dead objects - which would seemt o be
another bug)
-
+ it crashes by notifying dead objects - which would seemt to be
another bug)
+
FIXME:
Unfortunately this can increase memory consumption drastically
until the non transient parent
- is destroyed an finally all the transients are released.
+ is destroyed and finally all the transients are released.
*/
if ( ! rxAccessibleContext -> getAccessibleStateSet() -> contains (
AccessibleStateType::TRANSIENT ) )
#endif
diff --git a/main/vcl/aqua/source/a11y/aqua11yrolehelper.mm
b/main/vcl/aqua/source/a11y/aqua11yrolehelper.mm
index 085c090a07..b4a6338c0e 100644
--- a/main/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11yrolehelper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::uno;
switch( accessibleContext -> getAccessibleRole() ) {
#define MAP(a,b) \
case a: nativeRole = b; break
-
+
MAP( AccessibleRole::UNKNOWN, NSAccessibilityUnknownRole );
MAP( AccessibleRole::ALERT, NSAccessibilityUnknownRole ); // FIXME
MAP( AccessibleRole::COLUMN_HEADER, NSAccessibilityColumnRole );
diff --git a/main/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
b/main/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
index d9e9a0bf9c..453a9810a9 100644
--- a/main/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -45,14 +45,14 @@ using namespace ::com::sun::star::uno;
for ( sal_Int32 i=0 ; i < n ; ++i ) {
[ children addObject: [ AquaA11yFactory wrapperForAccessible:
xAccessibleSelection -> getSelectedAccessibleChild( i ) ] ];
}
-
+
return children;
-
+
} catch ( Exception& e)
{
}
}
-
+
return nil;
}
@@ -80,13 +80,13 @@ using namespace ::com::sun::star::uno;
Reference< XAccessibleSelection > xAccessibleSelection = [ wrapper
accessibleSelection ];
try {
xAccessibleSelection -> clearAccessibleSelection();
-
+
unsigned c = [ value count ];
for ( unsigned i = 0 ; i < c ; ++i ) {
xAccessibleSelection -> selectAccessibleChild( [ [ value
objectAtIndex: i ] accessibleContext ] -> getAccessibleIndexInParent() );
}
} catch ( Exception& e) {
- }
+ }
}
@end
diff --git a/main/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
b/main/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
index 87a8d16ffd..c2c1005d53 100644
--- a/main/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::uno;
{
sal_Int32 nRows = accessibleTable->getAccessibleRowCount();
sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
-
+
if( nRows * nCols < MAXIMUM_ACCESSIBLE_TABLE_CELLS )
{
// make all children visible to the hierarchy
@@ -101,12 +101,12 @@ using namespace ::com::sun::star::uno;
}
pResult = NSAccessibilityUnignoredChildren( cells );
}
- catch (const Exception &e)
+ catch (const Exception &e)
{
}
[cells autorelease];
}
-
+
return pResult;
}
@@ -116,9 +116,9 @@ using namespace ::com::sun::star::uno;
if( accessibleTable )
{
sal_Int32 nRows = accessibleTable->getAccessibleRowCount();
- sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
-
-
+ sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
+
+
if( nRows*nCols < MAXIMUM_ACCESSIBLE_TABLE_CELLS )
{
[ attributeNames addObject: NSAccessibilityRowsAttribute ];
@@ -135,7 +135,7 @@ using namespace ::com::sun::star::uno;
if( accessibleTable )
{
sal_Int32 nRows = accessibleTable->getAccessibleRowCount();
- sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
+ sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
if( nRows * nCols < MAXIMUM_ACCESSIBLE_TABLE_CELLS )
{
NSMutableArray * cells = [ [ NSMutableArray alloc ] init ];
@@ -155,14 +155,14 @@ using namespace ::com::sun::star::uno;
}
pResult = NSAccessibilityUnignoredChildren( cells );
}
- catch (const Exception &e)
+ catch (const Exception &e)
{
pResult = nil;
}
[ cells autorelease ];
}
}
-
+
return pResult;
}
@@ -171,11 +171,11 @@ using namespace ::com::sun::star::uno;
NSArray* pResult = nil;
XAccessibleTable * accessibleTable = [ self accessibleTable ];
-
+
if( accessibleTable )
{
sal_Int32 nRows = accessibleTable->getAccessibleRowCount();
- sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
+ sal_Int32 nCols = accessibleTable->getAccessibleColumnCount();
if( nRows * nCols < MAXIMUM_ACCESSIBLE_TABLE_CELLS )
{
NSMutableArray * cells = [ [ NSMutableArray alloc ] init ];
@@ -194,14 +194,14 @@ using namespace ::com::sun::star::uno;
}
pResult = NSAccessibilityUnignoredChildren( cells );
}
- catch (const Exception &e)
+ catch (const Exception &e)
{
pResult = nil;
}
[ cells autorelease ];
}
}
-
+
return pResult;
}
diff --git a/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
b/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 5f30b34cf7..b2cb3cd689 100644
--- a/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -47,7 +47,7 @@ using namespace ::rtl;
int underlineStyle = NSNoUnderlineStyle;
sal_Int16 value = 0;
property.Value >>= value;
- if ( value != ::css_awt::FontUnderline::NONE
+ if ( value != ::css_awt::FontUnderline::NONE
&& value != ::css_awt::FontUnderline::DONTKNOW) {
underlineStyle = NSSingleUnderlineStyle;
}
@@ -118,11 +118,11 @@ using namespace ::rtl;
[ font fontName ], NSAccessibilityFontNameKey,
[ font familyName ], NSAccessibilityFontFamilyKey,
[ font displayName ], NSAccessibilityVisibleNameKey,
- [ NSNumber numberWithFloat: [ font pointSize ] ],
NSAccessibilityFontSizeKey,
+ [ NSNumber numberWithFloat: [ font pointSize ] ],
NSAccessibilityFontSizeKey,
nil
];
- [ string addAttribute: NSAccessibilityFontTextAttribute
- value: fontDictionary
+ [ string addAttribute: NSAccessibilityFontTextAttribute
+ value: fontDictionary
range: range
];
}
diff --git a/main/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
b/main/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 616bf084e7..a31688df7f 100644
--- a/main/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -128,14 +128,14 @@ using namespace ::rtl;
}
+(NSArray *)specialAttributeNames {
- return [ NSArray arrayWithObjects:
- NSAccessibilityValueAttribute,
- NSAccessibilityNumberOfCharactersAttribute,
- NSAccessibilitySelectedTextAttribute,
- NSAccessibilitySelectedTextRangeAttribute,
- NSAccessibilityVisibleCharacterRangeAttribute,
- NSAccessibilitySharedTextUIElementsAttribute,
- NSAccessibilitySharedCharacterRangeAttribute,
+ return [ NSArray arrayWithObjects:
+ NSAccessibilityValueAttribute,
+ NSAccessibilityNumberOfCharactersAttribute,
+ NSAccessibilitySelectedTextAttribute,
+ NSAccessibilitySelectedTextRangeAttribute,
+ NSAccessibilityVisibleCharacterRangeAttribute,
+ NSAccessibilitySharedTextUIElementsAttribute,
+ NSAccessibilitySharedCharacterRangeAttribute,
nil ];
}
@@ -144,16 +144,16 @@ using namespace ::rtl;
}
+(NSArray *)specialParameterizedAttributeNames {
- return [ NSArray arrayWithObjects:
- NSAccessibilityStringForRangeParameterizedAttribute,
- NSAccessibilityAttributedStringForRangeParameterizedAttribute,
- NSAccessibilityRangeForIndexParameterizedAttribute,
- NSAccessibilityRangeForPositionParameterizedAttribute,
- NSAccessibilityBoundsForRangeParameterizedAttribute,
- NSAccessibilityStyleRangeForIndexParameterizedAttribute,
- NSAccessibilityRTFForRangeParameterizedAttribute,
- NSAccessibilityLineForIndexParameterizedAttribute,
- NSAccessibilityRangeForLineParameterizedAttribute,
+ return [ NSArray arrayWithObjects:
+ NSAccessibilityStringForRangeParameterizedAttribute,
+ NSAccessibilityAttributedStringForRangeParameterizedAttribute,
+ NSAccessibilityRangeForIndexParameterizedAttribute,
+ NSAccessibilityRangeForPositionParameterizedAttribute,
+ NSAccessibilityBoundsForRangeParameterizedAttribute,
+ NSAccessibilityStyleRangeForIndexParameterizedAttribute,
+ NSAccessibilityRTFForRangeParameterizedAttribute,
+ NSAccessibilityLineForIndexParameterizedAttribute,
+ NSAccessibilityRangeForLineParameterizedAttribute,
nil ];
}
diff --git a/main/vcl/aqua/source/a11y/aqua11yutil.mm
b/main/vcl/aqua/source/a11y/aqua11yutil.mm
index 406e6adfb9..ee64e3be79 100644
--- a/main/vcl/aqua/source/a11y/aqua11yutil.mm
+++ b/main/vcl/aqua/source/a11y/aqua11yutil.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
b/main/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
index b82fd77d5e..0d49addba6 100644
--- a/main/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -66,7 +66,7 @@ using namespace ::com::sun::star::uno;
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value {
// TODO: Detect Type from NSNumber
- if ( [ value isKindOfClass: [ NSNumber class ] ]
+ if ( [ value isKindOfClass: [ NSNumber class ] ]
&& [ wrapper accessibleValue ] != nil ) {
NSNumber * number = (NSNumber *) value;
Any numberAny ( [ number longValue ] );
@@ -80,8 +80,8 @@ using namespace ::com::sun::star::uno;
+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper
*)wrapper {
BOOL isSettable = NO;
- if ( [ wrapper accessibleValue ] != nil
- && [ attribute isEqualToString: NSAccessibilityValueAttribute ]
+ if ( [ wrapper accessibleValue ] != nil
+ && [ attribute isEqualToString: NSAccessibilityValueAttribute ]
&& ! [ wrapper isKindOfClass: [ AquaA11yWrapperStaticText class ] ] ) {
isSettable = YES;
}
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapper.mm
index c577ad4f44..47d01a870b 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -109,7 +109,7 @@ static BOOL isPopupMenuOpen = NO;
/* #i102033# NSAccessibility does not seemt to know an equivalent for
transient children.
That means we need to cache this, else e.g. tree list boxes are not
accessible (moreover
it crashes by notifying dead objects - which would seemt o be
another bug)
-
+
FIXME:
Unfortunately this can increase memory consumption drastically
until the non transient parent
is destroyed an finally all the transients are released.
@@ -163,9 +163,9 @@ static BOOL isPopupMenuOpen = NO;
NSRange aRange = { 2, 1 };
NSString * firstChar = [ attribute substringWithRange: aRange ]; //
drop leading "AX" and get first char
if ( asGetter ) {
- [ methodName appendString: [ firstChar lowercaseString ] ];
+ [ methodName appendString: [ firstChar lowercaseString ] ];
} else {
- [ methodName appendString: firstChar ];
+ [ methodName appendString: firstChar ];
}
[ methodName appendString: [ attribute substringFromIndex: 3 ] ]; //
append rest of attribute name
// append rest of method name
@@ -209,9 +209,9 @@ static BOOL isPopupMenuOpen = NO;
/*
Radiobutton grouping is done differently in NSAccessibility and the
UNO-API. In UNO related radio buttons share an entry in their
- RelationSet. In NSAccessibility the relationship is axpressed through the
hierarchy. A AXRadioGroup contains two or more AXRadioButton
- objects. Since this group is not available in the UNO hierarchy, an extra
wrapper is used for it. This wrapper shares almost all
- attributes with the first radio button of the group, except for the role,
subrole, role description, parent and children attributes.
+ RelationSet. In NSAccessibility the relationship is axpressed through the
hierarchy. A AXRadioGroup contains two or more AXRadioButton
+ objects. Since this group is not available in the UNO hierarchy, an extra
wrapper is used for it. This wrapper shares almost all
+ attributes with the first radio button of the group, except for the role,
subrole, role description, parent and children attributes.
So in this five methods there is a special treatment for radio buttons and
groups.
*/
@@ -301,7 +301,7 @@ static BOOL isPopupMenuOpen = NO;
}
} catch (const Exception&) {
}
-
+
OSL_ASSERT( 0 );
return nil;
}
@@ -333,7 +333,7 @@ static BOOL isPopupMenuOpen = NO;
try {
NSMutableArray * children = [ [ NSMutableArray alloc ] init ];
Reference< XAccessibleContext > xContext( [ self accessibleContext
] );
-
+
sal_Int32 cnt = xContext -> getAccessibleChildCount();
for ( sal_Int32 i = 0; i < cnt; i++ ) {
Reference< XAccessible > xChild( xContext ->
getAccessibleChild( i ) );
@@ -347,7 +347,7 @@ static BOOL isPopupMenuOpen = NO;
}
}
}
-
+
// if not already acting as RadioGroup now is the time to replace
RadioButtons with RadioGroups and remove RadioButtons
if ( ! mActsAsRadioGroup ) {
NSEnumerator * enumerator = [ children objectEnumerator ];
@@ -440,8 +440,8 @@ static BOOL isPopupMenuOpen = NO;
[ children release ];
return value;
} else {
- return [ AquaA11yRoleHelper getRoleDescriptionFrom:
- [ AquaA11yRoleHelper getNativeRoleFrom: [ self
accessibleContext ] ]
+ return [ AquaA11yRoleHelper getRoleDescriptionFrom:
+ [ AquaA11yRoleHelper getNativeRoleFrom: [ self
accessibleContext ] ]
with: [ AquaA11yRoleHelper getNativeSubroleFrom: [ self
accessibleContext ] -> getAccessibleRole() ] ];
}
}
@@ -667,7 +667,7 @@ static BOOL isPopupMenuOpen = NO;
if ( isPopupMenuOpen ) {
return nil;
}
-
+
id value = nil;
// if we are no longer in the wrapper repository, we have been disposed
AquaA11yWrapper * theWrapper = [ AquaA11yFactory
wrapperForAccessibleContext: [ self accessibleContext ] createIfNotExists: NO ];
@@ -707,7 +707,7 @@ static BOOL isPopupMenuOpen = NO;
case AccessibleRole::DIALOG:
ignored = YES;
break;
- default:
+ default:
ignored = ! ( [ self accessibleContext ] ->
getAccessibleStateSet() -> contains ( AccessibleStateType::VISIBLE ) );
break;
}
@@ -725,14 +725,14 @@ static BOOL isPopupMenuOpen = NO;
sal_Int32 nAccessibleChildren = 0;
try {
// Default Attributes
- attributeNames = [ NSMutableArray arrayWithObjects:
- NSAccessibilityRoleAttribute,
- NSAccessibilityDescriptionAttribute,
- NSAccessibilityParentAttribute,
- NSAccessibilityWindowAttribute,
- NSAccessibilityHelpAttribute,
- NSAccessibilityTopLevelUIElementAttribute,
- NSAccessibilityRoleDescriptionAttribute,
+ attributeNames = [ NSMutableArray arrayWithObjects:
+ NSAccessibilityRoleAttribute,
+ NSAccessibilityDescriptionAttribute,
+ NSAccessibilityParentAttribute,
+ NSAccessibilityWindowAttribute,
+ NSAccessibilityHelpAttribute,
+ NSAccessibilityTopLevelUIElementAttribute,
+ NSAccessibilityRoleDescriptionAttribute,
nil ];
nativeSubrole = (NSString *) [ AquaA11yRoleHelper
getNativeSubroleFrom: [ self accessibleContext ] -> getAccessibleRole() ];
title = (NSString *) [ self titleAttribute ];
@@ -750,7 +750,7 @@ static BOOL isPopupMenuOpen = NO;
}
catch( DisposedException& ) {}
catch( RuntimeException& ) {}
-
+
if ( title != nil && ! [ title isEqualToString: @"" ] ) {
[ attributeNames addObject: NSAccessibilityTitleAttribute ];
}
@@ -859,19 +859,19 @@ static BOOL isPopupMenuOpen = NO;
// as this seems to be the first API call on a newly created SalFrameView
object,
// make sure self gets registered in the repository ..
- [ self accessibleContext ];
+ [ self accessibleContext ];
AquaA11yWrapper * focusedUIElement =
AquaA11yFocusListener::get()->getFocusedUIElement();
// AquaA11yWrapper * ancestor = focusedUIElement;
-
+
// Make sure the focused object is a descendant of self
// do {
// if( self == ancestor )
return focusedUIElement;
-
+
// ancestor = [ ancestor accessibilityAttributeValue:
NSAccessibilityParentAttribute ];
// } while( nil != ancestor );
-
+
return self;
}
@@ -913,9 +913,9 @@ static BOOL isPopupMenuOpen = NO;
}
NSString * parentRole = (NSString *) [ parent accessibilityAttributeValue:
NSAccessibilityRoleAttribute ];
// if we are a textarea inside a combobox, then the combobox is the action
responder
- if ( enabled
- && [ role isEqualToString: NSAccessibilityTextAreaRole ]
- && [ parentRole isEqualToString: NSAccessibilityComboBoxRole ]
+ if ( enabled
+ && [ role isEqualToString: NSAccessibilityTextAreaRole ]
+ && [ parentRole isEqualToString: NSAccessibilityComboBoxRole ]
&& parentAsWrapper != nil ) {
wrapper = parentAsWrapper;
} else if ( enabled && [ self accessibleAction ] != nil ) {
@@ -974,7 +974,7 @@ Reference < XAccessibleContext > hitTestRunner (
com::sun::star::awt::Point poin
Reference < XAccessibleComponent > rxAccessibleComponent (
rxAccessibleContext, UNO_QUERY );
if ( rxAccessibleComponent.is() ) {
com::sun::star::awt::Point location = rxAccessibleComponent ->
getLocationOnScreen();
- com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
+ com::sun::star::awt::Point hitPoint ( point.X - location.X ,
point.Y - location.Y);
Reference < XAccessible > rxAccessible = rxAccessibleComponent ->
getAccessibleAtPoint ( hitPoint );
if ( rxAccessible.is() && rxAccessible ->
getAccessibleContext().is() ) {
if ( rxAccessible -> getAccessibleContext() ->
getAccessibleChildCount() > 0 ) {
@@ -986,7 +986,7 @@ Reference < XAccessibleContext > hitTestRunner (
com::sun::star::awt::Point poin
hitChild = rxAccessible -> getAccessibleContext();
}
}
- }
+ }
if ( !hitChild.is() && rxAccessibleContext ->
getAccessibleChildCount() > 0 ) { // special treatment for e.g. comboboxes
for ( int i = 0; i < rxAccessibleContext ->
getAccessibleChildCount(); i++ ) {
Reference < XAccessible > rxAccessibleChild =
rxAccessibleContext -> getAccessibleChild ( i );
@@ -1013,7 +1013,7 @@ Reference < XAccessibleContext > hitTestRunner (
com::sun::star::awt::Point poin
}
Reference < XAccessibleContext > hitChild;
NSRect screenRect = [ [ NSScreen mainScreen ] frame ];
- com::sun::star::awt::Point hitPoint ( static_cast<long>(point.x) ,
static_cast<long>(screenRect.size.height - point.y) );
+ com::sun::star::awt::Point hitPoint ( static_cast<long>(point.x) ,
static_cast<long>(screenRect.size.height - point.y) );
// check child windows first
NSWindow * window = (NSWindow *) [ self accessibilityAttributeValue:
NSAccessibilityWindowAttribute ];
NSArray * childWindows = [ window childWindows ];
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
index 3b2a16d153..db7bbd4eeb 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
index 017765048d..caff9ad772 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
index 3b7c29f1d3..f0a0a7952c 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -140,17 +140,17 @@ using namespace ::com::sun::star::uno;
NSMutableArray * attributeNames = [ NSMutableArray arrayWithArray: [ super
accessibilityAttributeNames ] ];
// Special Attributes and removing unwanted attributes depending on role
[ attributeNames removeObjectsInArray: [ NSArray arrayWithObjects:
- NSAccessibilityTitleAttribute,
- NSAccessibilityChildrenAttribute,
+ NSAccessibilityTitleAttribute,
+ NSAccessibilityChildrenAttribute,
nil ]
];
[ attributeNames addObjectsFromArray: [ NSArray arrayWithObjects:
- NSAccessibilityExpandedAttribute,
- NSAccessibilityValueAttribute,
- NSAccessibilityNumberOfCharactersAttribute,
- NSAccessibilitySelectedTextAttribute,
- NSAccessibilitySelectedTextRangeAttribute,
- NSAccessibilityVisibleCharacterRangeAttribute,
+ NSAccessibilityExpandedAttribute,
+ NSAccessibilityValueAttribute,
+ NSAccessibilityNumberOfCharactersAttribute,
+ NSAccessibilitySelectedTextAttribute,
+ NSAccessibilitySelectedTextRangeAttribute,
+ NSAccessibilityVisibleCharacterRangeAttribute,
nil ]
];
return attributeNames;
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
index 0060932b07..c69911dfa0 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -40,9 +40,9 @@
NSMutableArray * attributeNames = [ NSMutableArray arrayWithArray: [ super
accessibilityAttributeNames ] ];
// Special Attributes and removing unwanted attributes depending on role
[ attributeNames removeObjectsInArray: [ NSArray arrayWithObjects:
- NSAccessibilityTitleAttribute,
- NSAccessibilityEnabledAttribute,
- NSAccessibilitySelectedChildrenAttribute,
+ NSAccessibilityTitleAttribute,
+ NSAccessibilityEnabledAttribute,
+ NSAccessibilitySelectedChildrenAttribute,
nil ]
];
[ attributeNames addObject: NSAccessibilityContentsAttribute ];
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
index fc9bfff20d..dd98cb4b8a 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
index b01bb83d21..08ddf24da7 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
index 7ebb387432..96ce092b76 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
index 9d318228ab..f5ef03dcdf 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
index 78fa434a39..185d36a03c 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -43,7 +43,7 @@
id child;
while ( ( child = [ enumerator nextObject ] ) ) {
AquaA11yWrapper * element = ( AquaA11yWrapper * ) child;
- if ( [ element isKindOfClass: [ AquaA11yWrapperScrollBar class ] ]
) {
+ if ( [ element isKindOfClass: [ AquaA11yWrapperScrollBar class ] ]
) {
AquaA11yWrapperScrollBar * scrollBar =
(AquaA11yWrapperScrollBar *) element;
if ( [ [ scrollBar orientationAttribute ] isEqualToString:
orientation ] ) {
theScrollBar = scrollBar;
@@ -70,9 +70,9 @@
// Special Attributes and removing unwanted attributes depending on role
[ attributeNames removeObject: NSAccessibilityEnabledAttribute ];
[ attributeNames addObjectsFromArray: [ NSArray arrayWithObjects:
- NSAccessibilityContentsAttribute,
- NSAccessibilityVerticalScrollBarAttribute,
- NSAccessibilityHorizontalScrollBarAttribute,
+ NSAccessibilityContentsAttribute,
+ NSAccessibilityVerticalScrollBarAttribute,
+ NSAccessibilityHorizontalScrollBarAttribute,
nil ]
];
return attributeNames;
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
index 972b036b4d..a4f55c6d23 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
index 022d862ea1..2888c01072 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
b/main/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
index a22a7d90db..81882b1207 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
index ac3609ebc4..ca596af70b 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -35,10 +35,10 @@
// Default Attributes
NSMutableArray * attributeNames = [ NSMutableArray arrayWithArray: [ super
accessibilityAttributeNames ] ];
// Special Attributes and removing unwanted attributes depending on role
- [ attributeNames addObjectsFromArray: [ NSArray arrayWithObjects:
- NSAccessibilityContentsAttribute,
- NSAccessibilityTabsAttribute,
- nil ]
+ [ attributeNames addObjectsFromArray: [ NSArray arrayWithObjects:
+ NSAccessibilityContentsAttribute,
+ NSAccessibilityTabsAttribute,
+ nil ]
];
return attributeNames;
}
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
index 2f14cf6402..efdcdc0b16 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
b/main/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
index b7a5ced363..8a841dc1e6 100644
--- a/main/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
+++ b/main/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -36,8 +36,8 @@
NSMutableArray * attributeNames = [ NSMutableArray arrayWithArray: [ super
accessibilityAttributeNames ] ];
// Special Attributes and removing unwanted attributes depending on role
[ attributeNames removeObjectsInArray: [ NSArray arrayWithObjects:
- NSAccessibilityTitleAttribute,
- NSAccessibilityEnabledAttribute,
+ NSAccessibilityTitleAttribute,
+ NSAccessibilityEnabledAttribute,
nil ]
];
return attributeNames;
diff --git a/main/vcl/aqua/source/app/salnstimer.mm
b/main/vcl/aqua/source/app/salnstimer.mm
index 74900e92fe..5bbc5caa6d 100644
--- a/main/vcl/aqua/source/app/salnstimer.mm
+++ b/main/vcl/aqua/source/app/salnstimer.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -42,7 +42,7 @@
{
YIELD_GUARD;
pSVData->mpSalTimer->CallCallback();
-
+
// NSTimer does not end nextEventMatchingMask of NSApplication
// so we need to wakeup a waiting Yield to inform it something
happened
GetSalData()->mpFirstInstance->wakeupYield();
@@ -50,4 +50,3 @@
}
}
@end
-
diff --git a/main/vcl/aqua/source/app/vclnsapp.mm
b/main/vcl/aqua/source/app/vclnsapp.mm
index b34e62403d..51adc25087 100644
--- a/main/vcl/aqua/source/app/vclnsapp.mm
+++ b/main/vcl/aqua/source/app/vclnsapp.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -43,7 +43,7 @@
#import "apple_remote/RemoteControl.h"
#include "postmac.h"
-
+
@implementation CocoaThreadEnabler
-(void)enableCocoaThreads:(id)param
{
@@ -99,10 +99,10 @@
return;
}
}
-
+
/*
* #i98949# - Cmd-M miniaturize window, Cmd-Option-M miniaturize
all windows
- */
+ */
if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] )
{
if ( nModMask == NSCommandKeyMask && ([pFrame->getNSWindow()
styleMask] & NSMiniaturizableWindowMask) )
@@ -117,7 +117,7 @@
return;
}
}
-
+
// #i90083# handle frame switching
// FIXME: lousy workaround
if( (nModMask & (NSControlKeyMask|NSAlternateKeyMask)) == 0 )
@@ -135,21 +135,21 @@
return;
}
}
-
+
// get information whether the event was handled; keyDown returns
nothing
GetSalData()->maKeyEventAnswer[ pEvent ] = false;
bool bHandled = false;
-
+
// dispatch to view directly to avoid the key event being consumed
by the menubar
// popup windows do not get the focus, so they don't get these
either
// simplest would be dispatch this to the key window always if it
is without parent
// however e.g. in document we want the menu shortcut if e.g. the
stylist has focus
- if( pFrame->mpParent && (pFrame->mnStyle & SAL_FRAME_STYLE_FLOAT)
== 0 )
+ if( pFrame->mpParent && (pFrame->mnStyle & SAL_FRAME_STYLE_FLOAT)
== 0 )
{
[[pKeyWin contentView] keyDown: pEvent];
bHandled = GetSalData()->maKeyEventAnswer[ pEvent ];
}
-
+
// see whether the main menu consumes this event
// if not, we want to dispatch it ourselves. Unless we do this
"trick"
// the main menu just beeps for an unknown or disabled key
equivalent
@@ -179,7 +179,7 @@
unsigned int nModMask = ([pEvent modifierFlags] &
(NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask));
if( nModMask == NSCommandKeyMask )
{
-
+
if( [[pEvent charactersIgnoringModifiers] isEqualToString:
@"v"] )
{
if( [NSApp sendAction: @selector(paste:) to: nil from:
nil] )
@@ -259,7 +259,7 @@
-(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame
{
// do the same as cycleFrameForward only with a reverse iterator
-
+
// find current frame in list
std::list< AquaSalFrame* >& rFrames( GetSalData()->maFrames );
std::list< AquaSalFrame* >::reverse_iterator it = rFrames.rbegin();
@@ -295,7 +295,7 @@
}
}
}
-
+
-(NSMenu*)applicationDockMenu:(NSApplication *)sender
{
(void)sender;
@@ -319,10 +319,10 @@
{
(void)app;
rtl::OUStringBuffer aFileList( 256 );
-
+
NSEnumerator* it = [files objectEnumerator];
NSString* pFile = nil;
-
+
while( (pFile = [it nextObject]) != nil )
{
const rtl::OUString aFile( GetOUString( pFile ) );
@@ -333,7 +333,7 @@
aFileList.append( aFile );
}
}
-
+
if( aFileList.getLength() )
{
// we have no back channel here, we have to assume success, in which
case
@@ -361,10 +361,10 @@
(void)bShowPrintPanels;
// currently ignores print settings an bShowPrintPanels
rtl::OUStringBuffer aFileList( 256 );
-
+
NSEnumerator* it = [files objectEnumerator];
NSString* pFile = nil;
-
+
while( (pFile = [it nextObject]) != nil )
{
if( aFileList.getLength() > 0 )
@@ -385,7 +385,7 @@
NSApplicationTerminateReply aReply = NSTerminateNow;
{
YIELD_GUARD;
-
+
SalData* pSalData = GetSalData();
if( ! pSalData->maFrames.empty() )
{
@@ -393,7 +393,7 @@
[NSApp activateIgnoringOtherApps: YES];
aReply = pSalData->maFrames.front()->CallCallback(
SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
}
-
+
if( aReply == NSTerminateNow )
{
ApplicationEvent aEv( String(), ApplicationAddress(), ByteString(
"PRIVATE:DOSHUTDOWN" ), String() );
@@ -403,7 +403,7 @@
// can occur in Desktop::doShutdown for example
}
}
-
+
return aReply;
}
@@ -411,7 +411,7 @@
{
(void)pNotification;
YIELD_GUARD;
-
+
const SalData* pSalData = GetSalData();
if( !pSalData->maFrames.empty() )
pSalData->maFrames.front()->CallCallback(
SALEVENT_SETTINGSCHANGED, NULL );
@@ -421,7 +421,7 @@
{
(void)pNotification;
YIELD_GUARD;
-
+
SalData* pSalData = GetSalData();
std::list< AquaSalFrame* >::iterator it;
for( it = pSalData->maFrames.begin(); it != pSalData->maFrames.end(); ++it
)
@@ -470,7 +470,7 @@
if( pAppleRemoteCtrl && pAppleRemoteCtrl->remoteControl)
{
// [remoteControl startListening: self];
- // does crash because the right thing to do is
+ // does crash because the right thing to do is
// [pAppleRemoteCtrl->remoteControl startListening: self];
// but the instance variable 'remoteControl' is declared protected
// workaround : declare remoteControl instance variable as public in
RemoteMainController.m
@@ -498,12 +498,12 @@
if( pAppleRemoteCtrl && pAppleRemoteCtrl->remoteControl)
{
// [remoteControl stopListening: self];
- // does crash because the right thing to do is
+ // does crash because the right thing to do is
// [pAppleRemoteCtrl->remoteControl stopListening: self];
// but the instance variable 'remoteControl' is declared protected
// workaround : declare remoteControl instance variable as public in
RemoteMainController.m
- [pAppleRemoteCtrl->remoteControl stopListening: self];
+ [pAppleRemoteCtrl->remoteControl stopListening: self];
#ifdef DEBUG
NSLog(@"Apple Remote will resign active - Releasing remote controls");
#endif
@@ -534,4 +534,3 @@
@end
-
diff --git a/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
b/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index c5b46fd580..f5656db9d1 100644
--- a/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -86,7 +86,7 @@ class ControllerProperties
NSTextField* mpPageEdit;
NSStepper* mpStepper;
NSTextView* mpPagesLabel;
- ResStringArray maLocalizedStrings;
+ ResStringArray maLocalizedStrings;
public:
ControllerProperties( vcl::PrinterController* i_pController,
@@ -111,24 +111,24 @@ class ControllerProperties
mpState->bNeedRestart = false;
DBG_ASSERT( maLocalizedStrings.Count() >= 5, "resources not found !" );
}
-
+
rtl::OUString getMoreString()
{
return maLocalizedStrings.Count() >= 4
? rtl::OUString( maLocalizedStrings.GetString( 3 ) )
: rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "More" ) );
}
-
+
rtl::OUString getPrintSelectionString()
{
return maLocalizedStrings.Count() >= 5
? rtl::OUString( maLocalizedStrings.GetString( 4 ) )
: rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Print selection
only" ) );
}
-
+
void updatePrintJob()
{
- // TODO: refresh page count etc from mpController
+ // TODO: refresh page count etc from mpController
// page range may have changed depending on options
sal_Int32 nPages = mpController->getFilteredPageCount();
@@ -161,7 +161,7 @@ class ControllerProperties
updatePreviewImage( nPage-1 );
}
}
-
+
int addNameTag( const rtl::OUString& i_rPropertyName )
{
int nNewTag = mnNextTag++;
@@ -176,18 +176,18 @@ class ControllerProperties
maTagToValueInt[ nNewTag ] = i_nValue;
return nNewTag;
}
-
+
void addObservedControl( NSObject* i_pView )
{
maViews.push_back( i_pView );
}
-
+
void addViewPair( NSView* i_pLeft, NSView* i_pRight )
{
maViewPairMap[ i_pLeft ] = i_pRight;
maViewPairMap[ i_pRight ] = i_pLeft;
}
-
+
NSView* getPair( NSView* i_pLeft ) const
{
NSView* pRight = nil;
@@ -196,7 +196,7 @@ class ControllerProperties
pRight = it->second;
return pRight;
}
-
+
void changePropertyWithIntValue( int i_nTag )
{
std::map< int, rtl::OUString >::const_iterator name_it =
maTagToPropertyName.find( i_nTag );
@@ -225,7 +225,7 @@ class ControllerProperties
}
}
}
-
+
void changePropertyWithBoolValue( int i_nTag, sal_Bool i_bValue )
{
std::map< int, rtl::OUString >::const_iterator name_it =
maTagToPropertyName.find( i_nTag );
@@ -239,11 +239,11 @@ class ControllerProperties
pVal->Value <<= i_bValue ? sal_Int32(2) : sal_Int32(0);
else
pVal->Value <<= i_bValue;
- updatePrintJob();
+ updatePrintJob();
}
}
}
-
+
void changePropertyWithStringValue( int i_nTag, const rtl::OUString&
i_rValue )
{
std::map< int, rtl::OUString >::const_iterator name_it =
maTagToPropertyName.find( i_nTag );
@@ -253,11 +253,11 @@ class ControllerProperties
if( pVal )
{
pVal->Value <<= i_rValue;
- updatePrintJob();
+ updatePrintJob();
}
}
}
-
+
void updateEnableState()
{
for( std::vector< NSObject* >::iterator it = maViews.begin(); it !=
maViews.end(); ++it )
@@ -269,11 +269,11 @@ class ControllerProperties
pCtrl = (NSControl*)pObj;
else if( [pObj isKindOfClass: [NSCell class]] )
pCell = (NSCell*)pObj;
-
+
int nTag = pCtrl ? [pCtrl tag] :
pCell ? [pCell tag] :
-1;
-
+
std::map< int, rtl::OUString >::const_iterator name_it =
maTagToPropertyName.find( nTag );
if( name_it != maTagToPropertyName.end() && !
name_it->second.equalsAscii( "PrintContent" ) )
{
@@ -287,11 +287,11 @@ class ControllerProperties
}
else if( pCell )
[pCell setEnabled: bEnabled];
-
+
}
}
}
-
+
void updatePreviewImage( sal_Int32 i_nPage )
{
sal_Int32 nPages = mpController->getFilteredPageCount();
@@ -304,7 +304,7 @@ class ControllerProperties
PrinterController::PageSize aPageSize(
mpController->getFilteredPageFile( i_nPage, aMtf, false ) );
VirtualDevice aDev;
if(
mpController->getPrinter()->GetPrinterOptions().IsConvertToGreyscales() )
- aDev.SetDrawMode( aDev.GetDrawMode() | ( DRAWMODE_GRAYLINE |
DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT |
+ aDev.SetDrawMode( aDev.GetDrawMode() | ( DRAWMODE_GRAYLINE |
DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT |
DRAWMODE_GRAYBITMAP |
DRAWMODE_GRAYGRADIENT ) );
// see salprn.cxx, currently we pretend to be a 720dpi device on
printers
aDev.SetReferenceDevice( 720, 720 );
@@ -342,7 +342,7 @@ class ControllerProperties
{
if( maLocalizedStrings.Count() < 3 )
return;
-
+
// get the preview control
NSRect aPreviewFrame = [mpAccessoryView frame];
aPreviewFrame.origin.x = 0;
@@ -366,13 +366,13 @@ class ControllerProperties
[mpPreview setImageAlignment: NSImageAlignCenter];
[mpPreview setImageFrameStyle: NSImageFrameNone];
[mpPreviewBox addSubview: [mpPreview autorelease]];
-
+
// add a label
sal_Int32 nPages = mpController->getFilteredPageCount();
rtl::OUStringBuffer aBuf( 16 );
aBuf.appendAscii( "/ " );
aBuf.append( rtl::OUString::valueOf( nPages ) );
-
+
NSString* pText = CreateNSString( aBuf.makeStringAndClear() );
NSRect aTextRect = { { 100, 5 }, { 100, 22 } };
mpPagesLabel = [[NSTextView alloc] initWithFrame: aTextRect];
@@ -383,7 +383,7 @@ class ControllerProperties
[mpPagesLabel setString: [pText autorelease]];
[mpPagesLabel setToolTip: [CreateNSString(
maLocalizedStrings.GetString( 2 ) ) autorelease]];
[mpPreviewBox addSubview: [mpPagesLabel autorelease]];
-
+
NSRect aFieldRect = { { 45, 5 }, { 35, 25 } };
mpPageEdit = [[NSTextField alloc] initWithFrame: aFieldRect];
[mpPageEdit setEditable: YES];
@@ -391,14 +391,14 @@ class ControllerProperties
[mpPageEdit setDrawsBackground: YES];
[mpPageEdit setToolTip: [CreateNSString( maLocalizedStrings.GetString(
1 ) ) autorelease]];
[mpPreviewBox addSubview: [mpPageEdit autorelease]];
-
+
// add a stepper control
NSRect aStepFrame = { { 85, 5 }, { 15, 25 } };
mpStepper = [[NSStepper alloc] initWithFrame: aStepFrame];
[mpStepper setIncrement: 1];
[mpStepper setValueWraps: NO];
[mpPreviewBox addSubview: [mpStepper autorelease]];
-
+
// constrain the text field to decimal numbers
NSNumberFormatter* pFormatter = [[NSNumberFormatter alloc] init];
[pFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
@@ -410,20 +410,20 @@ class ControllerProperties
[mpPageEdit setFormatter: pFormatter];
[mpStepper setMinValue: 1];
[mpStepper setMaxValue: nPages];
-
+
[mpPageEdit setIntValue: 1];
[mpStepper setIntValue: 1];
-
+
// connect target and action
[mpStepper setTarget: i_pCtrlTarget];
[mpStepper setAction: @selector(triggeredPreview:)];
[mpPageEdit setTarget: i_pCtrlTarget];
[mpPageEdit setAction: @selector(triggeredPreview:)];
-
+
// set first preview image
updatePreviewImage( 0 );
}
-
+
void changePreview( NSObject* i_pSender )
{
if( [i_pSender isMemberOfClass: [NSTextField class]] )
@@ -462,7 +462,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
{
if( (self = [super init]) )
{
- mpController = pController;
+ mpController = pController;
}
return self;
}
@@ -514,7 +514,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
NSTextField* pField = (NSTextField*)pSender;
int nTag = [pField tag];
sal_Int64 nValue = [pField intValue];
-
+
NSView* pOther = mpController->getPair( pField );
if( pOther )
[(NSControl*)pOther setIntValue: nValue];
@@ -555,13 +555,13 @@ struct ColumnItem
NSControl* pControl;
long nOffset;
NSControl* pSubControl;
-
+
ColumnItem( NSControl* i_pControl = nil, long i_nOffset = 0, NSControl*
i_pSub = nil )
: pControl( i_pControl )
, nOffset( i_nOffset )
, pSubControl( i_pSub )
{}
-
+
long getWidth() const
{
long nWidth = 0;
@@ -587,7 +587,7 @@ static void adjustViewAndChildren( NSView* pNSView, NSSize&
rMaxSize,
)
{
// balance columns
-
+
// first get overall column widths
long nLeftWidth = 0;
long nRightWidth = 0;
@@ -603,7 +603,7 @@ static void adjustViewAndChildren( NSView* pNSView, NSSize&
rMaxSize,
if( nW > nRightWidth )
nRightWidth = nW;
}
-
+
// right align left column
for( size_t i = 0; i < rLeftColumn.size(); i++ )
{
@@ -633,14 +633,14 @@ static void adjustViewAndChildren( NSView* pNSView,
NSSize& rMaxSize,
if( rRightColumn[i].pSubControl )
{
NSRect aSubRect = [rRightColumn[i].pSubControl frame];
- aSubRect.origin.x = nX + aSubRect.origin.x -
aCtrlRect.origin.x;
+ aSubRect.origin.x = nX + aSubRect.origin.x -
aCtrlRect.origin.x;
[rRightColumn[i].pSubControl setFrame: aSubRect];
}
aCtrlRect.origin.x = nX;
[rRightColumn[i].pControl setFrame: aCtrlRect];
}
}
-
+
NSArray* pSubViews = [pNSView subviews];
unsigned int nViews = [pSubViews count];
NSRect aUnion = NSZeroRect;
@@ -650,7 +650,7 @@ static void adjustViewAndChildren( NSView* pNSView, NSSize&
rMaxSize,
{
aUnion = NSUnionRect( aUnion, [[pSubViews objectAtIndex: n] frame] );
}
-
+
// move everything so it will fit
for( unsigned int n = 0; n < nViews; n++ )
{
@@ -660,12 +660,12 @@ static void adjustViewAndChildren( NSView* pNSView,
NSSize& rMaxSize,
aFrame.origin.y -= aUnion.origin.y - 5;
[pCurSubView setFrame: aFrame];
}
-
+
// resize the view itself
aUnion.size.height += 10;
aUnion.size.width += 20;
[pNSView setFrameSize: aUnion.size];
-
+
if( aUnion.size.width > rMaxSize.width )
rMaxSize.width = aUnion.size.width;
if( aUnion.size.height > rMaxSize.height )
@@ -687,7 +687,7 @@ static void adjustTabViews( NSTabView* pTabView, NSSize
aTabSize )
double nDiff = aTabSize.height - aRect.size.height;
aRect.size = aTabSize;
[pNSView setFrame: aRect];
-
+
NSArray* pSubViews = [pNSView subviews];
unsigned int nSubViews = [pSubViews count];
@@ -766,17 +766,17 @@ static void linebreakCell( NSCell* pBtn, const
rtl::OUString& i_rText )
static void addSubgroup( NSView* pCurParent, long& rCurY, const rtl::OUString&
rText )
{
NSControl* pTextView = createLabel( rText );
- [pCurParent addSubview: [pTextView autorelease]];
+ [pCurParent addSubview: [pTextView autorelease]];
NSRect aTextRect = [pTextView frame];
// move to nCurY
aTextRect.origin.y = rCurY - aTextRect.size.height;
[pTextView setFrame: aTextRect];
-
+
NSRect aSepRect = { { aTextRect.size.width + 1, aTextRect.origin.y }, {
100, 6 } };
NSBox* pBox = [[NSBox alloc] initWithFrame: aSepRect];
[pBox setBoxType: NSBoxSeparator];
[pCurParent addSubview: [pBox autorelease]];
-
+
// update nCurY
rCurY = aTextRect.origin.y - 5;
}
@@ -791,35 +791,35 @@ static void addBool( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
{
NSRect aCheckRect = NSMakeRect( rCurX + nAttachOffset, 0, 0, 15);
NSButton* pBtn = [[NSButton alloc] initWithFrame: aCheckRect];
- [pBtn setButtonType: NSSwitchButton];
+ [pBtn setButtonType: NSSwitchButton];
[pBtn setState: bValue ? NSOnState : NSOffState];
if( ! bEnabled )
[pBtn setEnabled: NO];
linebreakCell( [pBtn cell], rText );
[pBtn sizeToFit];
-
+
rRightColumn.push_back( ColumnItem( pBtn ) );
-
+
// connect target
[pBtn setTarget: pCtrlTarget];
[pBtn setAction: @selector(triggered:)];
int nTag = pControllerProperties->addNameTag( rProperty );
pControllerProperties->addObservedControl( pBtn );
[pBtn setTag: nTag];
-
+
aCheckRect = [pBtn frame];
// #i115837# add a murphy factor; it can apparently occasionally happen
// that sizeToFit does not a perfect job and that the button linebreaks
again
// if - and only if - there is already a '\n' contained in the text and
the width
// is minimally of
aCheckRect.size.width += 1;
-
+
// move to rCurY
aCheckRect.origin.y = rCurY - aCheckRect.size.height;
[pBtn setFrame: aCheckRect];
[pCurParent addSubview: [pBtn autorelease]];
-
+
// update rCurY
rCurY = aCheckRect.origin.y - 5;
}
@@ -841,23 +841,23 @@ static void addRadio( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttach
NSRect aTextRect = [pTextView frame];
aTextRect.origin.x = rCurX + nAttachOffset;
[pCurParent addSubview: [pTextView autorelease]];
-
+
rLeftColumn.push_back( ColumnItem( pTextView ) );
-
+
// move to nCurY
aTextRect.origin.y = rCurY - aTextRect.size.height;
[pTextView setFrame: aTextRect];
-
+
// update nCurY
rCurY = aTextRect.origin.y - 5;
-
+
// indent the radio group relative to the text
// nOff = 20;
}
-
+
// setup radio matrix
NSButtonCell* pProto = [[NSButtonCell alloc] init];
-
+
NSRect aRadioRect = NSMakeRect( rCurX + nOff, 0, 280 - rCurX,
5*rChoices.getLength());
[pProto setTitle: @"RadioButtonGroup"];
[pProto setButtonType: NSRadioButton];
@@ -885,17 +885,17 @@ static void addRadio( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttach
}
[pMatrix sizeToFit];
aRadioRect = [pMatrix frame];
-
+
// move it down, so it comes to the correct position
aRadioRect.origin.y = rCurY - aRadioRect.size.height;
[pMatrix setFrame: aRadioRect];
[pCurParent addSubview: [pMatrix autorelease]];
-
+
rRightColumn.push_back( ColumnItem( pMatrix ) );
-
+
// update nCurY
rCurY = aRadioRect.origin.y - 5;
-
+
[pProto release];
}
@@ -931,7 +931,7 @@ static void addList( NSView* pCurParent, long& rCurX, long&
rCurY, long /*nAttac
}
[pBtn selectItemAtIndex: nSelectValue];
-
+
// add the button to observed controls for enabled state changes
// also add a tag just for this purpose
pControllerProperties->addObservedControl( pBtn );
@@ -939,18 +939,18 @@ static void addList( NSView* pCurParent, long& rCurX,
long& rCurY, long /*nAttac
[pBtn sizeToFit];
[pCurParent addSubview: [pBtn autorelease]];
-
+
rRightColumn.push_back( ColumnItem( pBtn ) );
// connect target and action
[pBtn setTarget: pCtrlTarget];
[pBtn setAction: @selector(triggered:)];
-
+
// move to nCurY
aBtnRect = [pBtn frame];
aBtnRect.origin.y = rCurY - aBtnRect.size.height;
[pBtn setFrame: aBtnRect];
-
+
// align label
aTextRect.origin.y = aBtnRect.origin.y + (aBtnRect.size.height -
aTextRect.size.height)/2;
[pTextView setFrame: aTextRect];
@@ -976,22 +976,22 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
// add a label
NSControl* pTextView = createLabel( rText );
[pCurParent addSubview: [pTextView autorelease]];
-
+
rLeftColumn.push_back( ColumnItem( pTextView ) );
-
+
// move to nCurY
NSRect aTextRect = [pTextView frame];
aTextRect.origin.x = rCurX + nAttachOffset;
aTextRect.origin.y = rCurY - aTextRect.size.height;
[pTextView setFrame: aTextRect];
-
+
// update nCurY
rCurY = aTextRect.origin.y - 5;
-
+
// and set the offset for the real edit field
nOff = aTextRect.size.width + 5;
}
-
+
NSRect aFieldRect = NSMakeRect( rCurX + nOff + nAttachOffset, 0, 100, 25);
NSTextField* pFieldView = [[NSTextField alloc] initWithFrame: aFieldRect];
[pFieldView setEditable: YES];
@@ -999,9 +999,9 @@ static void addEdit( NSView* pCurParent, long& rCurX, long&
rCurY, long nAttachO
[pFieldView setDrawsBackground: YES];
[pFieldView sizeToFit]; // FIXME: this does nothing
[pCurParent addSubview: [pFieldView autorelease]];
-
+
rRightColumn.push_back( ColumnItem( pFieldView ) );
-
+
// add the field to observed controls for enabled state changes
// also add a tag just for this purpose
pControllerProperties->addObservedControl( pFieldView );
@@ -1024,13 +1024,13 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
[pStep setValueWraps: NO];
[pStep setTag: nTag];
[pCurParent addSubview: [pStep autorelease]];
-
+
rRightColumn.back().pSubControl = pStep;
-
+
pControllerProperties->addObservedControl( pStep );
[pStep setTarget: pCtrlTarget];
[pStep setAction: @selector(triggered:)];
-
+
// constrain the text field to decimal numbers
NSNumberFormatter* pFormatter = [[NSNumberFormatter alloc] init];
[pFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
@@ -1049,7 +1049,7 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
sal_Int64 nSelectVal = 0;
if( pValue && pValue->Value.hasValue() )
pValue->Value >>= nSelectVal;
-
+
[pFieldView setIntValue: nSelectVal];
[pStep setIntValue: nSelectVal];
@@ -1099,14 +1099,14 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
NSView* pAccessoryView = [[NSView alloc] initWithFrame: aViewFrame];
NSTabView* pTabView = [[NSTabView alloc] initWithFrame: aTabViewFrame];
[pAccessoryView addSubview: [pTabView autorelease]];
-
+
sal_Bool bIgnoreSubgroup = sal_False;
-
+
ControllerProperties* pControllerProperties = new ControllerProperties(
pController, pOp, pAccessoryView, pTabView, pState );
ControlTarget* pCtrlTarget = [[ControlTarget alloc] initWithControllerMap:
pControllerProperties];
-
+
std::vector< ColumnItem > aLeftColumn, aRightColumn;
-
+
// ugly:
// prepend a "selection" checkbox if the properties have such a selection
in PrintContent
bool bAddSelectionCheckBox = false, bSelectionBoxEnabled = false,
bSelectionBoxChecked = false;
@@ -1233,7 +1233,7 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
// so we have a single accessory view that is tabbed for grouping
if( aCtrlType.equalsAscii( "Group" )
|| ! pCurParent
- || ( aCtrlType.equalsAscii( "Subgroup" ) && nCurY < -250 && !
bIgnore )
+ || ( aCtrlType.equalsAscii( "Subgroup" ) && nCurY < -250 && !
bIgnore )
)
{
rtl::OUString aGroupTitle( aText );
@@ -1242,7 +1242,7 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
// set size of current parent
if( pCurParent )
adjustViewAndChildren( pCurParent, aMaxTabSize,
aLeftColumn, aRightColumn );
-
+
// new tab item
if( ! aText.getLength() )
aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OOo"
) );
@@ -1253,7 +1253,7 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
pCurParent = [[NSView alloc] initWithFrame: aTabViewFrame];
[pItem setView: pCurParent];
[pLabel release];
-
+
// reset indent
nCurX = 20;
// reset Y
@@ -1271,13 +1271,13 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
bAddSelectionCheckBox = false;
}
}
-
+
if( aCtrlType.equalsAscii( "Subgroup" ) && pCurParent )
{
bIgnoreSubgroup = bIgnore;
if( bIgnore )
continue;
-
+
addSubgroup( pCurParent, nCurY, aText );
}
else if( bIgnoreSubgroup || bIgnore )
@@ -1286,7 +1286,7 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
}
else if( aCtrlType.equalsAscii( "Bool" ) && pCurParent )
{
- sal_Bool bVal = sal_False;
+ sal_Bool bVal = sal_False;
PropertyValue* pVal = pController->getValue( aPropertyName );
if( pVal )
pVal->Value >>= bVal;
@@ -1335,17 +1335,17 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
DBG_ERROR( "Unsupported UI option" );
}
}
-
+
pControllerProperties->updateEnableState();
adjustViewAndChildren( pCurParent, aMaxTabSize, aLeftColumn, aRightColumn
);
-
+
// leave some space for the preview
if( aMaxTabSize.height < 200 )
aMaxTabSize.height = 200;
-
+
// now reposition everything again so it is upper bound
adjustTabViews( pTabView, aMaxTabSize );
-
+
// find the minimum needed tab size
NSSize aTabCtrlSize = [pTabView minimumSize];
aTabCtrlSize.height += aMaxTabSize.height + 10;
@@ -1355,16 +1355,16 @@ static void addEdit( NSView* pCurParent, long& rCurX,
long& rCurY, long nAttachO
aViewFrame.size.width = aTabCtrlSize.width + aTabViewFrame.origin.x;
aViewFrame.size.height = aTabCtrlSize.height + aTabViewFrame.origin.y;
[pAccessoryView setFrameSize: aViewFrame.size];
-
+
pControllerProperties->setupPreview( pCtrlTarget );
// set the accessory view
[pOp setAccessoryView: [pAccessoryView autorelease]];
-
+
// set the current selecte tab item
if( pState->nLastPage >= 0 && pState->nLastPage < [pTabView
numberOfTabViewItems] )
[pTabView selectTabViewItemAtIndex: pState->nLastPage];
-
+
return pCtrlTarget;
}
diff --git a/main/vcl/aqua/source/gdi/aquaprintview.mm
b/main/vcl/aqua/source/gdi/aquaprintview.mm
index f64561d75b..7647080e3d 100644
--- a/main/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/main/vcl/aqua/source/gdi/aquaprintview.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -71,7 +71,7 @@
mpInfoPrinter->setStartPageOffset( static_cast<int>(rect.origin.x),
static_cast<int>(rect.origin.y) );
NSSize aPaperSize = [mpInfoPrinter->getPrintInfo() paperSize];
int nPage = (int)(aPaperSize.width * rect.origin.y + rect.origin.x);
-
+
// page count is 1 based
if( nPage - 1 < (mpInfoPrinter->getCurPageRangeStart() +
mpInfoPrinter->getCurPageRangeCount() ) )
mpController->printFilteredPage( nPage-1 );
diff --git a/main/vcl/aqua/source/window/salframeview.mm
b/main/vcl/aqua/source/window/salframeview.mm
index 4e0bbd1450..f60ac44e62 100644
--- a/main/vcl/aqua/source/window/salframeview.mm
+++ b/main/vcl/aqua/source/window/salframeview.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -105,7 +105,7 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode )
if( aCode < sizeof( aKeyCodeMap) / sizeof( aKeyCodeMap[0] ) )
nKeyCode = aKeyCodeMap[ aCode ];
else if( aCode >= 0xf700 && aCode < 0xf780 )
- nKeyCode = aFunctionKeyCodeMap[ aCode - 0xf700 ];
+ nKeyCode = aFunctionKeyCodeMap[ aCode - 0xf700 ];
return nKeyCode;
}
@@ -204,7 +204,7 @@ static AquaSalFrame* getMouseContainerFrame()
-(BOOL)canBecomeKeyWindow
{
- if( (mpFrame->mnStyle &
+ if( (mpFrame->mnStyle &
( SAL_FRAME_STYLE_FLOAT |
SAL_FRAME_STYLE_TOOLTIP |
SAL_FRAME_STYLE_INTRO
@@ -569,7 +569,7 @@ private:
However if a non SalFrameWindow is on screen (like e.g. the
file dialog)
it can be hit with the containsMouse selector, which it doesn't
support.
Sadly NSApplication:makeWindowsPerform does not check (for
performance reasons
- I assume) whether a window supports a selector before sending
it.
+ I assume) whether a window supports a selector before sending
it.
*/
AquaSalFrame* pMouseFrame = getMouseContainerFrame();
if( pMouseFrame )
@@ -610,7 +610,7 @@ private:
-(void)mouseDown: (NSEvent*)pEvent
{
- if ( mpMouseEventListener != nil &&
+ if ( mpMouseEventListener != nil &&
[mpMouseEventListener respondsToSelector: @selector(mouseDown:)])
{
[mpMouseEventListener mouseDown: [pEvent copyWithZone: NULL]];
@@ -622,7 +622,7 @@ private:
-(void)mouseDragged: (NSEvent*)pEvent
{
- if ( mpMouseEventListener != nil &&
+ if ( mpMouseEventListener != nil &&
[mpMouseEventListener respondsToSelector:
@selector(mouseDragged:)])
{
[mpMouseEventListener mouseDragged: [pEvent copyWithZone: NULL]];
@@ -939,7 +939,7 @@ private:
-(BOOL)handleKeyDownException:(NSEvent*)pEvent
{
// check for a very special set of modified characters
- NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers];
+ NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers];
if( pUnmodifiedString && [pUnmodifiedString length] == 1 )
{
@@ -1020,7 +1020,7 @@ private:
if( mpLastEvent && ( [mpLastEvent type] == NSKeyDown ||
[mpLastEvent type] == NSKeyUp ) )
{
// get unmodified string
- NSString* pUnmodifiedString = [mpLastEvent
charactersIgnoringModifiers];
+ NSString* pUnmodifiedString = [mpLastEvent
charactersIgnoringModifiers];
if( pUnmodifiedString && [pUnmodifiedString length] == 1 )
{
// map the unmodified key code
@@ -1480,7 +1480,7 @@ private:
-(BOOL)sendSingleCharacter: (NSEvent *)pEvent
{
- NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers];
+ NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers];
if( pUnmodifiedString && [pUnmodifiedString length] == 1 )
{
@@ -1639,7 +1639,7 @@ private:
/* build target 10.5 or greater */
- (NSInteger)conversationIdentifier
#else
-/* build target 10.4 */
+/* build target 10.4 */
- (long)conversationIdentifier
#endif
{
@@ -1698,7 +1698,7 @@ private:
if ( mpReferenceWrapper == nil ) {
// some frames never become visible ..
Window *pWindow = mpFrame -> GetWindow();
- if ( ! pWindow )
+ if ( ! pWindow )
return nil;
mpReferenceWrapper = new ReferenceWrapper;
@@ -1766,4 +1766,3 @@ private:
}
@end
-
diff --git a/main/vcl/aqua/source/window/salnsmenu.mm
b/main/vcl/aqua/source/window/salnsmenu.mm
index 22fe89d463..d5afe611a0 100644
--- a/main/vcl/aqua/source/window/salnsmenu.mm
+++ b/main/vcl/aqua/source/window/salnsmenu.mm
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -31,7 +31,7 @@
#include "aqua/salnsmenu.h"
#include "vcl/window.hxx"
-
+
@implementation SalNSMenu
-(id)initWithMenu: (AquaSalMenu*)pMenu
{
@@ -43,7 +43,7 @@
{
(void)pMenu;
YIELD_GUARD;
-
+
if( mpMenu )
{
const AquaSalFrame* pFrame = mpMenu->getFrame();
@@ -83,7 +83,7 @@
{
(void)aSender;
YIELD_GUARD;
-
+
const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ?
mpMenuItem->mpParentMenu->getFrame() : NULL;
if( pFrame && AquaSalFrame::isAlive( pFrame ) && !
pFrame->GetWindow()->IsInModalMode() )
{
@@ -99,13 +99,13 @@
if( pPopupMenu )
{
// FIXME: revise this ugly code
-
+
// select handlers in vcl are dispatch on the original menu
// if not consumed by the select handler of the current menu
// however since only the starting menu ever came into Execute
// the hierarchy is not build up. Workaround this by getting
// the menu it should have been
-
+
// get started from hierarchy in vcl menus
AquaSalMenu* pParentMenu = mpMenuItem->mpParentMenu;
Menu* pCurMenu = mpMenuItem->mpVCLMenu;
@@ -114,7 +114,7 @@
pCurMenu = pParentMenu->mpVCLMenu;
pParentMenu = pParentMenu->mpParentSalMenu;
}
-
+
pPopupMenu->SetSelectedEntry( mpMenuItem->mnId );
pPopupMenu->ImplSelectWithStart( pCurMenu );
}
@@ -174,7 +174,7 @@
}
return;
}
-
+
aImgRect.origin.x += aFromRect.size.width + 2;
}
}
@@ -205,5 +205,3 @@
[self setFrameSize: aSize];
}
@end
-
-
