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 33608c8 Fixed typos, removed whitespace 33608c8 is described below commit 33608c82206695bbbe0b645fe8a658bc051dbbbe Author: mseidel <msei...@apache.org> AuthorDate: Sat Oct 3 14:37:53 2020 +0200 Fixed typos, removed whitespace --- main/desktop/source/app/lockfile.cxx | 112 ++++++------ main/desktop/source/migration/migration.cxx | 55 +++--- main/desktop/source/pkgchk/unopkg/unopkg_app.cxx | 99 +++++----- .../win32/source/guiloader/genericloader.cxx | 98 +++++----- .../source/layoutmanager/toolbarlayoutmanager.cxx | 201 +++++++++++---------- main/framework/source/tabwin/tabwindow.cxx | 23 +-- 6 files changed, 291 insertions(+), 297 deletions(-) diff --git a/main/desktop/source/app/lockfile.cxx b/main/desktop/source/app/lockfile.cxx index 0758404..b8da3cf 100644 --- a/main/desktop/source/app/lockfile.cxx +++ b/main/desktop/source/app/lockfile.cxx @@ -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. - * + * *************************************************************/ @@ -51,29 +51,29 @@ namespace desktop { // initialize static members... // lock suffix const OUString Lockfile::Suffix() - { return OUString::createFromAscii( "/.lock" ); } + { return OUString::createFromAscii( "/.lock" ); } // values for datafile const ByteString Lockfile::Group() - { return ByteString( "Lockdata" ); } + { return ByteString( "Lockdata" ); } const ByteString Lockfile::Userkey() - { return ByteString( "User" ); } + { return ByteString( "User" ); } const ByteString Lockfile::Hostkey() - { return ByteString( "Host" ); } + { return ByteString( "Host" ); } const ByteString Lockfile::Stampkey() - { return ByteString( "Stamp" ); } + { return ByteString( "Stamp" ); } const ByteString Lockfile::Timekey() - { return ByteString( "Time" ); } + { return ByteString( "Time" ); } const ByteString Lockfile::IPCkey() - { return ByteString( "IPCServer" ); } + { return ByteString( "IPCServer" ); } Lockfile::Lockfile( bool bIPCserver ) - :m_bIPCserver(bIPCserver) + :m_bIPCserver(bIPCserver) ,m_bRemove(sal_False) - ,m_bIsLocked(sal_False) + ,m_bIsLocked(sal_False) { // build the file-url to use for the lock OUString aUserPath; - utl::Bootstrap::locateUserInstallation( aUserPath ); + utl::Bootstrap::locateUserInstallation( aUserPath ); m_aLockname = aUserPath + Suffix(); // generate ID @@ -92,11 +92,11 @@ namespace desktop { // generate date string char *tmpTime = ctime( &t ); if (tmpTime != NULL) { - m_aDate = OUString::createFromAscii( tmpTime ); - sal_Int32 i = m_aDate.indexOf('\n'); - if (i > 0) - m_aDate = m_aDate.copy(0, i); - } + m_aDate = OUString::createFromAscii( tmpTime ); + sal_Int32 i = m_aDate.indexOf('\n'); + if (i > 0) + m_aDate = m_aDate.copy(0, i); + } // try to create file @@ -117,7 +117,7 @@ namespace desktop { if (m_bIsLocked) { // lock existed, ask user what to do if (isStale() || - (execWarning != 0 && (*execWarning)( this ))) { + (execWarning != 0 && (*execWarning)( this ))) { // remove file and create new File::remove( m_aLockname ); File aFile(m_aLockname); @@ -145,29 +145,29 @@ namespace desktop { String aLockname = m_aLockname; Config aConfig(aLockname); aConfig.SetGroup(Group()); - ByteString aIPCserver = aConfig.ReadKey( IPCkey() ); - if (! aIPCserver.EqualsIgnoreCaseAscii( "true" )) - return false; + ByteString aIPCserver = aConfig.ReadKey( IPCkey() ); + if (! aIPCserver.EqualsIgnoreCaseAscii( "true" )) + return false; - ByteString aHost = aConfig.ReadKey( Hostkey() ); - ByteString aUser = aConfig.ReadKey( Userkey() ); + ByteString aHost = aConfig.ReadKey( Hostkey() ); + ByteString aUser = aConfig.ReadKey( Userkey() ); // lockfile from same host? ByteString myHost; #ifdef WNT - /* - prevent windows from connecting to the net to get it's own - hostname by using the netbios name - */ - sal_Int32 sz = MAX_COMPUTERNAME_LENGTH + 1; - char* szHost = new char[sz]; - if (GetComputerName(szHost, (LPDWORD)&sz)) - myHost = OString(szHost); - else - myHost = OString("UNKNOWN"); - delete[] szHost; + /* + prevent Windows from connecting to the net to get its own + hostname by using the netbios name + */ + sal_Int32 sz = MAX_COMPUTERNAME_LENGTH + 1; + char* szHost = new char[sz]; + if (GetComputerName(szHost, (LPDWORD)&sz)) + myHost = OString(szHost); + else + myHost = OString("UNKNOWN"); + delete[] szHost; #else oslSocketResult sRes; - myHost = OUStringToOString( + myHost = OUStringToOString( SocketAddr::getLocalHostname( &sRes ), RTL_TEXTENCODING_ASCII_US ); #endif if (aHost == myHost) { @@ -175,7 +175,7 @@ namespace desktop { OUString myUserName; Security aSecurity; aSecurity.getUserName( myUserName ); - ByteString myUser = OUStringToOString( myUserName, RTL_TEXTENCODING_ASCII_US ); + ByteString myUser = OUStringToOString( myUserName, RTL_TEXTENCODING_ASCII_US ); if (aUser == myUser) return sal_True; } @@ -189,28 +189,28 @@ namespace desktop { aConfig.SetGroup(Group()); // get information - ByteString aHost; + ByteString aHost; #ifdef WNT - /* - prevent windows from connecting to the net to get it's own - hostname by using the netbios name - */ - sal_Int32 sz = MAX_COMPUTERNAME_LENGTH + 1; - char* szHost = new char[sz]; - if (GetComputerName(szHost, (LPDWORD)&sz)) - aHost = OString(szHost); - else - aHost = OString("UNKNOWN"); - delete[] szHost; + /* + prevent Windows from connecting to the net to get its own + hostname by using the netbios name + */ + sal_Int32 sz = MAX_COMPUTERNAME_LENGTH + 1; + char* szHost = new char[sz]; + if (GetComputerName(szHost, (LPDWORD)&sz)) + aHost = OString(szHost); + else + aHost = OString("UNKNOWN"); + delete[] szHost; #else oslSocketResult sRes; - aHost = OUStringToOString( + aHost = OUStringToOString( SocketAddr::getLocalHostname( &sRes ), RTL_TEXTENCODING_ASCII_US ); #endif OUString aUserName; Security aSecurity; aSecurity.getUserName( aUserName ); - ByteString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); + ByteString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); ByteString aTime = OUStringToOString( m_aDate, RTL_TEXTENCODING_ASCII_US ); ByteString aStamp = OUStringToOString( m_aId, RTL_TEXTENCODING_ASCII_US ); @@ -242,11 +242,3 @@ namespace desktop { } } - - - - - - - - diff --git a/main/desktop/source/migration/migration.cxx b/main/desktop/source/migration/migration.cxx index c517f54..a84e9ba 100644 --- a/main/desktop/source/migration/migration.cxx +++ b/main/desktop/source/migration/migration.cxx @@ -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. - * + * *************************************************************/ @@ -273,11 +273,11 @@ sal_Bool MigrationImpl::doMigration() { // compile file list for migration m_vrFileList = compileFileList(); - + sal_Bool result = sal_False; try { - NewVersionUIInfo aNewVersionUIInfo; + NewVersionUIInfo aNewVersionUIInfo; ::std::vector< MigrationModuleInfo > vModulesInfo = dectectUIChangesForAllModules(); aNewVersionUIInfo.init(vModulesInfo); @@ -334,7 +334,7 @@ sal_Bool MigrationImpl::doMigration() ::rtl::OUString sParent; compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionToolbarSettings, sModuleIdentifier, sToolbarResourceURL); - } + } } m_aOldVersionItemsHashMap.clear(); @@ -422,7 +422,7 @@ bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr // get supported version names uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); uno::Sequence< OUString > seqSupportedVersions = aMigrationAccess->getElementNames(); - + const OUString aVersionIdentifiers( RTL_CONSTASCII_USTRINGPARAM( "VersionIdentifiers" )); const OUString aPriorityIdentifier( RTL_CONSTASCII_USTRINGPARAM( "Priority" )); @@ -450,7 +450,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio // get migration access uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); uno::Reference< XNameAccess > xMigrationData( aMigrationAccess->getByName(rMigrationName), uno::UNO_QUERY_THROW ); - + // get migration description from from org.openoffice.Setup/Migration // and build vector of migration steps OUString aMigrationSteps( RTL_CONSTASCII_USTRINGPARAM( "MigrationSteps" )); @@ -479,7 +479,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio } } - // exluded files... + // excluded files... if (tmpAccess->getByName(OUString::createFromAscii("ExcludedFiles")) >>= tmpSeq) { for (sal_Int32 j=0; j<tmpSeq.getLength(); j++) @@ -558,7 +558,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) aProfileName = (*i_ver).copy( nSeparatorIndex+1 ); } - if ( aVersion.getLength() && aProfileName.getLength() && + if ( aVersion.getLength() && aProfileName.getLength() && ( !aInfo.userdata.getLength() || !aProfileName.toAsciiLowerCase().compareTo( aProductName, aProductName.getLength() ) ) ) { @@ -591,7 +591,7 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available { sal_Int32 nIndex( -1 ); sal_Int32 i( 0 ); - + migrations_available::const_iterator rIter = rAvailableMigrations.begin(); while ( rIter != rAvailableMigrations.end() ) { @@ -837,7 +837,7 @@ void MigrationImpl::substract(strings_v& va, const strings_v& vb_c) const va.erase(i_in); i_in = i_next; // we can only find one match since we - // ensured uniquness of the entries. ergo: + // ensured uniqueness of the entries. ergo: break; } else @@ -932,7 +932,7 @@ void MigrationImpl::runServices() // and execute the migration job uno::Reference< XJob > xMigrationJob; - migrations_v::const_iterator i_mig = m_vrMigrations->begin(); + migrations_v::const_iterator i_mig = m_vrMigrations->begin(); while (i_mig != m_vrMigrations->end()) { if( i_mig->service.getLength() > 0) @@ -944,8 +944,8 @@ void MigrationImpl::runServices() uno::Sequence< rtl::OUString > seqExtBlackList; sal_uInt32 nSize = i_mig->excludeExtensions.size(); if ( nSize > 0 ) - seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >( - &i_mig->excludeExtensions[0], nSize ); + seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >( + &i_mig->excludeExtensions[0], nSize ); seqArguments[2] = uno::makeAny(NamedValue( OUString::createFromAscii("ExtensionBlackList"), uno::makeAny( seqExtBlackList ))); @@ -1025,7 +1025,7 @@ void MigrationImpl::runServices() for (sal_Int32 j=0; j<lToolbars.getLength(); ++j) { ::rtl::OUString sToolbarName = lToolbars[j]; - if (sToolbarName.getLength()>=nCustomLen && + if (sToolbarName.getLength()>=nCustomLen && sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT)) continue; @@ -1113,7 +1113,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } else if (pFound == vNewItems.end()) { - MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); + MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aOldVersionItemsHashMap.find(sResourceURL)==m_aOldVersionItemsHashMap.end()) { ::std::vector< MigrationItem > vMigrationItems; @@ -1146,7 +1146,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } else if (::std::find(vOldItems.begin(), vOldItems.end(), *it) == vOldItems.end()) { - MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); + MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu); if (m_aNewVersionItemsHashMap.find(sResourceURL)==m_aNewVersionItemsHashMap.end()) { ::std::vector< MigrationItem > vMigrationItems; @@ -1162,9 +1162,9 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, } } -void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, - const uno::Reference< container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, +void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, + const uno::Reference< container::XIndexContainer>& xIndexContainer, + const ::rtl::OUString& sModuleIdentifier, const ::rtl::OUString& sResourceURL) { MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL); @@ -1178,7 +1178,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat ::rtl::OUString sParentNodeName = it->m_sParentNodeName; sal_Int32 nIndex = 0; - do + do { ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); if (sToken.getLength()<=0) @@ -1191,7 +1191,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat ::rtl::OUString sLabel; uno::Reference< container::XIndexContainer > xChild; - uno::Sequence< beans::PropertyValue > aPropSeq; + uno::Sequence< beans::PropertyValue > aPropSeq; xTemp->getByIndex(i) >>= aPropSeq; for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j) { @@ -1233,7 +1233,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat for (; i<nCount; ++i) { ::rtl::OUString sCmd; - uno::Sequence< beans::PropertyValue > aTempPropSeq; + uno::Sequence< beans::PropertyValue > aTempPropSeq; xTemp->getByIndex(i) >>= aTempPropSeq; for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j) { @@ -1263,14 +1263,14 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat } uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const -{ +{ uno::Reference< ui::XUIConfigurationManager > xCfgManager; for (sal_Int32 i=0; i<m_lCfgManagerSeq.getLength(); ++i) { if (m_lCfgManagerSeq[i].Name.equals(sModuleShortName)) { - m_lCfgManagerSeq[i].Value >>= xCfgManager; + m_lCfgManagerSeq[i].Value >>= xCfgManager; break; } } @@ -1368,3 +1368,4 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules } } // namespace desktop + diff --git a/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 2faea79..9e46192 100644 --- a/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/main/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -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 @@ struct ExtensionName bool operator () ( Reference<deployment::XPackage> const & e ) const { if (m_str.equals(dp_misc::getIdentifier(e)) - || m_str.equals(e->getName())) + || m_str.equals(e->getName())) return true; return false; } @@ -76,7 +76,7 @@ struct ExtensionName const char s_usingText [] = "\n" "using: " APP_NAME " add <options> extension-path...\n" -" " APP_NAME " validate <options> extension-identifier...\n" +" " APP_NAME " validate <options> extension-identifier...\n" " " APP_NAME " remove <options> extension-identifier...\n" " " APP_NAME " list <options> extension-identifier...\n" " " APP_NAME " reinstall <options>\n" @@ -188,7 +188,7 @@ Reference<deployment::XPackage> findPackage( //workaround for some reason the bridge threads which communicate with the uno.exe -//process are not releases on time +//process are not released on time void disposeBridges(Reference<css::uno::XComponentContext> ctx) { if (!ctx.is()) @@ -203,7 +203,7 @@ void disposeBridges(Reference<css::uno::XComponentContext> ctx) { const Sequence< Reference<css::bridge::XBridge> >seqBridges = bridgeFac->getExistingBridges(); for (sal_Int32 i = 0; i < seqBridges.getLength(); i++) - { + { Reference<css::lang::XComponent> comp(seqBridges[i], UNO_QUERY); if (comp.is()) { @@ -236,7 +236,7 @@ extern "C" int unopkg_main() OUString repository; OUString cmdArg; ::std::vector<OUString> cmdPackages; - + OptionInfo const * info_shared = getOptionInfo( s_option_infos, OUSTR("shared") ); OptionInfo const * info_force = getOptionInfo( @@ -256,10 +256,10 @@ extern "C" int unopkg_main() OptionInfo const * info_suppressLicense = getOptionInfo( s_option_infos, OUSTR("suppress-license") ); - + Reference<XComponentContext> xComponentContext; Reference<XComponentContext> xLocalComponentContext; - + try { sal_uInt32 nPos = 0; sal_uInt32 nCount = osl_getCommandArgCount(); @@ -272,9 +272,9 @@ extern "C" int unopkg_main() dp_misc::writeConsole( "\n" APP_NAME " Version 3.3\n"); return 0; } - //consume all bootstrap variables which may occur before the subcommannd + // consume all bootstrap variables which may occur before the subcommand while(isBootstrapVariable(&nPos)); - + if(nPos >= nCount) return 0; //get the sub command @@ -285,7 +285,7 @@ extern "C" int unopkg_main() RTL_CONSTASCII_STRINGPARAM("add") ); subcmd_gui = subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("gui") ); - + // sun-command options and packages: while (nPos < nCount) { @@ -313,7 +313,7 @@ extern "C" int unopkg_main() OUSTR("\nERROR: unexpected option ") + cmdArg + OUSTR("!\n") + - OUSTR(" Use " APP_NAME " ") + + OUSTR(" Use " APP_NAME " ") + toString(info_help) + OUSTR(" to print all options.\n")); return 1; @@ -330,14 +330,14 @@ extern "C" int unopkg_main() } } } - - if (repository.getLength() == 0) + + if (repository.getLength() == 0) { if (option_shared) repository = OUSTR("shared"); else if (option_bundled) - repository = OUSTR("bundled"); - else + repository = OUSTR("bundled"); + else repository = OUSTR("user"); } else @@ -380,15 +380,15 @@ extern "C" int unopkg_main() //The UserInstallation is diverted to the prereg folder. But only //the lock file is written! This requires that //-env:UNO_JAVA_JFW_INSTALL_DATA is passed to javaldx and unopkg otherwise the - //javasettings file is written to the prereg folder. + //javasettings file is written to the prereg folder. // //For performance reasons unopkg sync is called during the setup and //creates the registration data for the repository of the bundled //extensions. It is then copied to the user installation during - //startup of OOo (userdata/extensions/bundled). The registration + //startup of AOO (userdata/extensions/bundled). The registration //data is in the brand installation and must be removed when - //uninstalling OOo. We do this here, before UNO is - //bootstrapped. Otherwies files could be locked by this process. + //uninstalling AOO. We do this here, before UNO is + //bootstrapped. Otherwise files could be locked by this process. //If there is no folder left in //$OOO_BASE_DIR/share/extensions @@ -417,14 +417,14 @@ extern "C" int unopkg_main() xComponentContext = getUNO( disposeGuard, option_verbose, option_shared, subcmd_gui, xLocalComponentContext ); - + Reference<deployment::XExtensionManager> xExtensionManager( deployment::ExtensionManager::get( xComponentContext ) ); Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv( createCmdEnv( xComponentContext, logFile, option_force, option_verbose) ); - + //synchronize bundled/shared extensions //Do not synchronize when command is "reinstall". This could add types and services to UNO and //prevent the deletion of the registry data folder @@ -467,7 +467,7 @@ extern "C" int unopkg_main() throw; else if (p.is()) xExtensionManager->removeExtension( - ::dp_misc::getIdentifier(p), p->getName(), + ::dp_misc::getIdentifier(p), p->getName(), repository, Reference<task::XAbortChannel>(), xCmdEnv ); } @@ -486,20 +486,20 @@ extern "C" int unopkg_main() ::comphelper::sequenceToContainer(vecExtUnaccepted, xExtensionManager->getExtensionsWithUnacceptedLicenses( repository, xCmdEnv)); - - //This vector tells what XPackage in allExtensions has an + + //This vector tells what XPackage in allExtensions has an //unaccepted license. std::vector<bool> vecUnaccepted; std::vector<Reference<deployment::XPackage> > allExtensions; if (cmdPackages.empty()) { - Sequence< Reference<deployment::XPackage> > + Sequence< Reference<deployment::XPackage> > packages = xExtensionManager->getDeployedExtensions( repository, Reference<task::XAbortChannel>(), xCmdEnv ); ::std::vector<Reference<deployment::XPackage> > vec_packages; ::comphelper::sequenceToContainer(vec_packages, packages); - + //First copy the extensions with the unaccepted license //to vector allExtensions. allExtensions.resize(vecExtUnaccepted.size() + vec_packages.size()); @@ -516,7 +516,7 @@ extern "C" int unopkg_main() ::std::fill_n( vecUnaccepted.begin(), vecExtUnaccepted.size(), true); std::vector<bool>::iterator i_unaccepted = vecUnaccepted.begin() + vecExtUnaccepted.size(); ::std::fill_n(i_unaccepted, vec_packages.size(), false); - + dp_misc::writeConsole( OUSTR("All deployed ") + repository + OUSTR(" extensions:\n\n")); } @@ -558,15 +558,15 @@ extern "C" int unopkg_main() allExtensions.push_back(extension); vecUnaccepted.push_back(bUnacceptedLic); } - + else throw lang::IllegalArgumentException( OUSTR("There is no such extension deployed: ") + cmdPackages[pos],0,-1); } - + } - + printf_packages(allExtensions, vecUnaccepted, xCmdEnv ); } else if (subCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("validate") )) @@ -611,7 +611,7 @@ extern "C" int unopkg_main() { Reference<ui::dialogs::XAsynchronousExecutableDialog> xDialog( deployment::ui::PackageManagerDialog::createAndInstall( - xComponentContext, + xComponentContext, cmdPackages.size() > 0 ? cmdPackages[0] : OUString() )); osl::Condition dialogEnded; @@ -633,36 +633,36 @@ extern "C" int unopkg_main() else { dp_misc::writeConsoleError(OUSTR("\nError: office is running")); - } + } } else { dp_misc::writeConsoleError( - OUSTR("\nERROR: unknown sub-command ") + + OUSTR("\nERROR: unknown sub-command ") + subCommand + - OUSTR("!\n") + - OUSTR(" Use " APP_NAME " ") + + OUSTR("!\n") + + OUSTR(" Use " APP_NAME " ") + toString(info_help) + OUSTR(" to print all options.\n")); return 1; } - + if (option_verbose) dp_misc::writeConsole( OUSTR( "\n" APP_NAME " done.\n")); //Force to release all bridges which connect us to the child processes disposeBridges(xLocalComponentContext); return 0; } - catch (ucb::CommandFailedException &e) + catch (ucb::CommandFailedException &e) { dp_misc::writeConsoleError(e.Message + OUSTR("\n")); - bNoOtherErrorMsg = true; + bNoOtherErrorMsg = true; } - catch (ucb::CommandAbortedException &) + catch (ucb::CommandAbortedException &) { dp_misc::writeConsoleError( "\n" APP_NAME " aborted!\n"); } - catch (deployment::DeploymentException & exc) + catch (deployment::DeploymentException & exc) { OUString cause; if (option_verbose) @@ -673,7 +673,7 @@ extern "C" int unopkg_main() { css::uno::Exception e; if (exc.Cause >>= e) - cause = e.Message; + cause = e.Message; } dp_misc::writeConsoleError( @@ -682,7 +682,7 @@ extern "C" int unopkg_main() dp_misc::writeConsoleError( OUSTR(" Cause: ") + cause + OUSTR("\n")); } - catch (LockFileException & e) + catch (LockFileException & e) { if (!subcmd_gui) dp_misc::writeConsoleError(e.Message); @@ -690,10 +690,10 @@ extern "C" int unopkg_main() } catch (::com::sun::star::uno::Exception & e ) { Any exc( ::cppu::getCaughtException() ); - + dp_misc::writeConsoleError( - OUSTR("\nERROR: ") + - OUString(option_verbose ? e.Message + OUSTR("\nException details: \n") + + OUSTR("\nERROR: ") + + OUString(option_verbose ? e.Message + OUSTR("\nException details: \n") + ::comphelper::anyToString(exc) : e.Message) + OUSTR("\n")); } @@ -703,4 +703,3 @@ extern "C" int unopkg_main() return 1; } - diff --git a/main/desktop/win32/source/guiloader/genericloader.cxx b/main/desktop/win32/source/guiloader/genericloader.cxx index 2c7e225..3b2c03e 100644 --- a/main/desktop/win32/source/guiloader/genericloader.cxx +++ b/main/desktop/win32/source/guiloader/genericloader.cxx @@ -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. - * + * *************************************************************/ @@ -51,10 +51,10 @@ static int GenericMain() { TCHAR szTargetFileName[MAX_PATH]; - TCHAR szIniDirectory[MAX_PATH]; + TCHAR szIniDirectory[MAX_PATH]; STARTUPINFO aStartupInfo; - desktop_win32::extendLoaderEnvironment(szTargetFileName, szIniDirectory); + desktop_win32::extendLoaderEnvironment(szTargetFileName, szIniDirectory); ZeroMemory( &aStartupInfo, sizeof(aStartupInfo) ); aStartupInfo.cb = sizeof(aStartupInfo); @@ -65,46 +65,46 @@ static int GenericMain() PROCESS_INFORMATION aProcessInfo; - size_t iniDirLen = wcslen(szIniDirectory); - WCHAR cwd[MAX_PATH]; - DWORD cwdLen = GetCurrentDirectoryW(MAX_PATH, cwd); - if (cwdLen >= MAX_PATH) { - cwdLen = 0; - } - WCHAR redirect[MAX_PATH]; - DWORD dummy; - bool hasRedirect = - tools::buildPath( - redirect, szIniDirectory, szIniDirectory + iniDirLen, - MY_STRING(L"redirect.ini")) != NULL && - (GetBinaryType(redirect, &dummy) || // cheaper check for file existence? - GetLastError() != ERROR_FILE_NOT_FOUND); - LPTSTR cl1 = GetCommandLine(); - WCHAR * cl2 = new WCHAR[ - wcslen(cl1) + - (hasRedirect - ? (MY_LENGTH(L" \"-env:INIFILENAME=vnd.sun.star.pathname:") + - iniDirLen + MY_LENGTH(L"redirect.ini\"")) - : 0) + - MY_LENGTH(L" \"-env:OOO_CWD=2") + 4 * cwdLen + MY_LENGTH(L"\"") + 1]; - // 4 * cwdLen: each char preceded by backslash, each trailing backslash - // doubled - WCHAR * p = desktop_win32::commandLineAppend(cl2, cl1); - if (hasRedirect) { - p = desktop_win32::commandLineAppend( - p, MY_STRING(L" \"-env:INIFILENAME=vnd.sun.star.pathname:")); - p = desktop_win32::commandLineAppend(p, szIniDirectory); - p = desktop_win32::commandLineAppend(p, MY_STRING(L"redirect.ini\"")); - } - p = desktop_win32::commandLineAppend(p, MY_STRING(L" \"-env:OOO_CWD=")); - if (cwdLen == 0) { - p = desktop_win32::commandLineAppend(p, MY_STRING(L"0")); - } else { - p = desktop_win32::commandLineAppend(p, MY_STRING(L"2")); - p = desktop_win32::commandLineAppendEncoded(p, cwd); - } - desktop_win32::commandLineAppend(p, MY_STRING(L"\"")); - + size_t iniDirLen = wcslen(szIniDirectory); + WCHAR cwd[MAX_PATH]; + DWORD cwdLen = GetCurrentDirectoryW(MAX_PATH, cwd); + if (cwdLen >= MAX_PATH) { + cwdLen = 0; + } + WCHAR redirect[MAX_PATH]; + DWORD dummy; + bool hasRedirect = + tools::buildPath( + redirect, szIniDirectory, szIniDirectory + iniDirLen, + MY_STRING(L"redirect.ini")) != NULL && + (GetBinaryType(redirect, &dummy) || // cheaper check for file existence? + GetLastError() != ERROR_FILE_NOT_FOUND); + LPTSTR cl1 = GetCommandLine(); + WCHAR * cl2 = new WCHAR[ + wcslen(cl1) + + (hasRedirect + ? (MY_LENGTH(L" \"-env:INIFILENAME=vnd.sun.star.pathname:") + + iniDirLen + MY_LENGTH(L"redirect.ini\"")) + : 0) + + MY_LENGTH(L" \"-env:OOO_CWD=2") + 4 * cwdLen + MY_LENGTH(L"\"") + 1]; + // 4 * cwdLen: each char preceded by backslash, each trailing backslash + // doubled + WCHAR * p = desktop_win32::commandLineAppend(cl2, cl1); + if (hasRedirect) { + p = desktop_win32::commandLineAppend( + p, MY_STRING(L" \"-env:INIFILENAME=vnd.sun.star.pathname:")); + p = desktop_win32::commandLineAppend(p, szIniDirectory); + p = desktop_win32::commandLineAppend(p, MY_STRING(L"redirect.ini\"")); + } + p = desktop_win32::commandLineAppend(p, MY_STRING(L" \"-env:OOO_CWD=")); + if (cwdLen == 0) { + p = desktop_win32::commandLineAppend(p, MY_STRING(L"0")); + } else { + p = desktop_win32::commandLineAppend(p, MY_STRING(L"2")); + p = desktop_win32::commandLineAppendEncoded(p, cwd); + } + desktop_win32::commandLineAppend(p, MY_STRING(L"\"")); + BOOL fSuccess = CreateProcess( szTargetFileName, cl2, @@ -117,7 +117,7 @@ static int GenericMain() &aStartupInfo, &aProcessInfo ); - delete[] cl2; + delete[] cl2; if ( fSuccess ) { @@ -126,11 +126,11 @@ static int GenericMain() do { // On Windows XP it seems as the desktop calls WaitForInputIdle after "OpenWidth" so we have to do so - // as if we where processing any messages + // as if we were processing any messages dwWaitResult = MsgWaitForMultipleObjects( 1, &aProcessInfo.hProcess, FALSE, INFINITE, QS_ALLEVENTS ); - if ( WAIT_OBJECT_0 + 1 == dwWaitResult ) + if ( WAIT_OBJECT_0 + 1 == dwWaitResult ) { MSG msg; diff --git a/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx index a951b55..b5b8ef3 100644 --- a/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -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. - * + * *************************************************************/ @@ -54,8 +54,8 @@ using namespace ::com::sun::star; namespace framework { -ToolbarLayoutManager::ToolbarLayoutManager( - const uno::Reference< lang::XMultiServiceFactory >& xSMGR, +ToolbarLayoutManager::ToolbarLayoutManager( + const uno::Reference< lang::XMultiServiceFactory >& xSMGR, const uno::Reference< ui::XUIElementFactory >& xUIElementFactory, ILayoutNotifications* pParentLayouter ) : ThreadHelpBase( &Application::GetSolarMutex() ), @@ -82,7 +82,7 @@ ToolbarLayoutManager::ToolbarLayoutManager( // initialize rectangles to zero values setZeroRectangle( m_aDockingAreaOffsets ); setZeroRectangle( m_aDockingArea ); - + // create toolkit object m_xToolkit = uno::Reference< awt::XToolkit >( m_xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), uno::UNO_QUERY ); } @@ -135,11 +135,11 @@ awt::Rectangle ToolbarLayoutManager::getDockingArea() if ( isLayoutDirty() ) aNewDockingArea = implts_calcDockingArea(); - + aWriteLock.lock(); m_aDockingArea = aNewDockingArea; aWriteLock.unlock(); - + return putRectangleValueToAWT(aNewDockingArea); } @@ -163,12 +163,12 @@ void ToolbarLayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangl aReadLock.unlock(); uno::Reference< awt::XDevice > xDevice( xContainerWindow, uno::UNO_QUERY ); - - // Convert relativ size to output size. + + // Convert relative size to output size. awt::Rectangle aRectangle = xContainerWindow->getPosSize(); awt::DeviceInfo aInfo = xDevice->getInfo(); - awt::Size aContainerClientSize = awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset , - aRectangle.Height - aInfo.TopInset - aInfo.BottomInset ); + awt::Size aContainerClientSize = awt::Size( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset , + aRectangle.Height - aInfo.TopInset - aInfo.BottomInset ); long aStatusBarHeight = aDockOffsets.GetHeight(); sal_Int32 nLeftRightDockingAreaHeight( aContainerClientSize.Height ); @@ -249,7 +249,7 @@ void ToolbarLayoutManager::doLayout(const ::Size& aContainerSize) } implts_setDockingAreaWindowSizes( aDockingArea ); - + aWriteLock.lock(); m_bLayoutDirty = false; m_bLayoutInProgress = false; @@ -371,7 +371,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea() } void ToolbarLayoutManager::reset() -{ +{ WriteGuard aWriteLock( m_aLock ); uno::Reference< ui::XUIConfigurationManager > xModuleCfgMgr( m_xModuleCfgMgr ); uno::Reference< ui::XUIConfigurationManager > xDocCfgMgr( m_xDocCfgMgr ); @@ -384,7 +384,7 @@ void ToolbarLayoutManager::reset() resetDockingArea(); } -void ToolbarLayoutManager::attach( +void ToolbarLayoutManager::attach( const uno::Reference< frame::XFrame >& xFrame, const uno::Reference< ui::XUIConfigurationManager >& xModuleCfgMgr, const uno::Reference< ui::XUIConfigurationManager >& xDocCfgMgr, @@ -393,7 +393,7 @@ void ToolbarLayoutManager::attach( // reset toolbar manager if we lose our current frame if ( m_xFrame.is() && m_xFrame != xFrame ) reset(); - + WriteGuard aWriteLock( m_aLock ); m_xFrame = xFrame; m_xModuleCfgMgr = xModuleCfgMgr; @@ -420,13 +420,13 @@ bool ToolbarLayoutManager::requestToolbar( const ::rtl::OUString& rResourceURL ) ReadGuard aReadLock( m_aLock ); uno::Reference< frame::XFrame > xFrame( m_xFrame ); aReadLock.unlock(); - + uno::Reference< frame::XModel > xModel( impl_getModelFromFrame( xFrame )); if ( implts_isPreviewModel( xModel )) return false; // no toolbars for preview frame! - + UIElement aRequestedToolbar = impl_findToolbar( rResourceURL ); - if ( aRequestedToolbar.m_aName != rResourceURL ) + if ( aRequestedToolbar.m_aName != rResourceURL ) { bMustCallCreate = true; aRequestedToolbar.m_aName = rResourceURL; @@ -434,19 +434,19 @@ bool ToolbarLayoutManager::requestToolbar( const ::rtl::OUString& rResourceURL ) aRequestedToolbar.m_xUIElement = xUIElement; implts_readWindowStateData( rResourceURL, aRequestedToolbar ); } - + xUIElement = aRequestedToolbar.m_xUIElement; if ( !xUIElement.is() ) bMustCallCreate = true; - + bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible & !aRequestedToolbar.m_bMasterHide ); uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow, uno::UNO_QUERY ); if ( xContainerWindow.is() && aRequestedToolbar.m_bFloating ) bCreateOrShowToolbar &= bool( xContainerWindow->isActive()); - + if ( bCreateOrShowToolbar ) bNotify = ( bMustCallCreate ) ? createToolbar( rResourceURL ) : showToolbar( rResourceURL ); - + return bNotify; } @@ -454,7 +454,7 @@ bool ToolbarLayoutManager::createToolbar( const ::rtl::OUString& rResourceURL ) { bool bNotify( false ); uno::Reference< ui::XUIElement > xUITempElement; - + implts_createToolBar( rResourceURL, bNotify, xUITempElement ); return bNotify; } @@ -462,7 +462,7 @@ bool ToolbarLayoutManager::createToolbar( const ::rtl::OUString& rResourceURL ) bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) { const rtl::OUString aAddonTbResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" )); - + UIElementVector::iterator pIter; uno::Reference< lang::XComponent > xComponent; @@ -470,7 +470,7 @@ bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) bool bMustBeSorted( false ); bool bMustLayouted( false ); bool bMustBeDestroyed( rResourceURL.indexOf( aAddonTbResourceName ) != 0 ); - + WriteGuard aWriteLock( m_aLock ); for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) { @@ -521,7 +521,7 @@ bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) bMustLayouted = true; bMustBeSorted = true; } - + if ( bMustBeDestroyed ) { if ( xComponent.is() ) @@ -531,7 +531,7 @@ bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) if ( bMustLayouted ) implts_setLayoutDirty(); - + if ( bMustBeSorted ) implts_sortUIElements(); @@ -744,7 +744,7 @@ bool ToolbarLayoutManager::dockToolbar( const ::rtl::OUString& rResourceURL, ui: if ( xDockWindow->isFloating() ) { - // ATTENTION: This will call toggleFloatingMode() via notifications which + // ATTENTION: This will call toggleFloatingMode() via notifications which // sets the floating member of the UIElement correctly! xDockWindow->setFloatingMode( sal_False ); } @@ -808,7 +808,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) ::rtl::OUString aToolbarName; ::rtl::OUString aCommand; ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() ); - + if ( pToolBox ) { aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox ); @@ -846,7 +846,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) else if ( pEvent->GetId() == VCLEVENT_TOOLBOX_FORMATCHANGED ) { if ( !implts_isToolbarCreationActive() ) - { + { ToolBox* pToolBox = getToolboxPtr( ((VclWindowEvent*)pEvent)->GetWindow() ); if ( pToolBox ) { @@ -860,7 +860,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) UIElement aToolbar = implts_findToolbar( aBuf.makeStringAndClear() ); if ( aToolbar.m_xUIElement.is() && !aToolbar.m_bFloating ) { - implts_setLayoutDirty(); + implts_setLayoutDirty(); m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED ); } } @@ -880,7 +880,7 @@ void ToolbarLayoutManager::resetDockingArea() uno::Reference< awt::XWindow > xRightDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] ); uno::Reference< awt::XWindow > xBottomDockingWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] ); aReadLock.unlock(); - + if ( xTopDockingWindow.is() ) xTopDockingWindow->setPosSize( 0, 0, 0, 0, awt::PosSize::POSSIZE ); if ( xLeftDockingWindow.is() ) @@ -891,7 +891,7 @@ void ToolbarLayoutManager::resetDockingArea() xBottomDockingWindow->setPosSize( 0, 0, 0, 0, awt::PosSize::POSSIZE ); } -void ToolbarLayoutManager::setParentWindow( +void ToolbarLayoutManager::setParentWindow( const uno::Reference< awt::XWindowPeer >& xParentWindow ) { static const char DOCKINGAREASTRING[] = "dockingarea"; @@ -900,9 +900,9 @@ void ToolbarLayoutManager::setParentWindow( uno::Reference< awt::XWindow > xLeftDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY ); uno::Reference< awt::XWindow > xRightDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY ); uno::Reference< awt::XWindow > xBottomDockWindow = uno::Reference< awt::XWindow >( createToolkitWindow( m_xSMGR, xParentWindow, DOCKINGAREASTRING ), uno::UNO_QUERY ); - + WriteGuard aWriteLock( m_aLock ); - m_xContainerWindow = uno::Reference< awt::XWindow2 >( xParentWindow, uno::UNO_QUERY ); + m_xContainerWindow = uno::Reference< awt::XWindow2 >( xParentWindow, uno::UNO_QUERY ); m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] = xTopDockWindow; m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] = xLeftDockWindow; m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] = xRightDockWindow; @@ -1132,10 +1132,10 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars() { aName = pTbNames[i]; parseResourceURL( aName, aElementType, aElementName ); - + // Check that we only create: // - Toolbars (the statusbar is also member of the persistent window state) - // - Not custom toolbars, there are created with their own method (implts_createCustomToolbars) + // - Not custom toolbars, they are created with their own method (implts_createCustomToolbars) if ( aElementType.equalsIgnoreAsciiCaseAscii( "toolbar" ) && aElementName.indexOf( m_aCustomTbxPrefix ) == -1 ) { UIElement aNewToolbar = implts_findToolbar( aName ); @@ -1190,13 +1190,13 @@ void ToolbarLayoutManager::implts_createCustomToolBar( const rtl::OUString& aTbx bool bNotify( false ); uno::Reference< ui::XUIElement > xUIElement; implts_createToolBar( aTbxResName, bNotify, xUIElement ); - + if ( !aTitle.isEmpty() && xUIElement.is() ) { vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = getWindowFromXUIElement( xUIElement ); - if ( pWindow ) + if ( pWindow ) pWindow->SetText( aTitle ); } } @@ -1275,12 +1275,12 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b aReadLock.unlock(); bNotify = false; - + if ( !xFrame.is() || !xContainerWindow.is() ) return; UIElement aToolbarElement = implts_findToolbar( aName ); - if ( !aToolbarElement.m_xUIElement.is() ) + if ( !aToolbarElement.m_xUIElement.is() ) { uno::Reference< ui::XUIElement > xUIElement = implts_createElement( aName ); @@ -1289,7 +1289,7 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b if ( xUIElement.is() ) { rUIElement = xUIElement; - + uno::Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), uno::UNO_QUERY ); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); if ( xDockWindow.is() && xWindow.is() ) @@ -1346,7 +1346,7 @@ void ToolbarLayoutManager::implts_createToolBar( const ::rtl::OUString& aName, b pToolbar->SetMenuType( nMenuType | TOOLBOX_MENUTYPE_CUSTOMIZE ); } bNotify = true; - + implts_sortUIElements(); if ( bVisible && !bFloating ) @@ -1428,8 +1428,8 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno pWindow->SetText( rElement.m_aUIName ); } - ::Point aPos( rElement.m_aFloatingData.m_aPos.X(), - rElement.m_aFloatingData.m_aPos.Y() ); + ::Point aPos( rElement.m_aFloatingData.m_aPos.X(), + rElement.m_aFloatingData.m_aPos.Y() ); bool bWriteData( false ); bool bUndefPos = hasDefaultPosValue( rElement.m_aFloatingData.m_aPos ); bool bSetSize = ( rElement.m_aFloatingData.m_aSize.Width() != 0 && @@ -1483,7 +1483,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno if ( pToolBox ) { vos::OGuard aGuard( Application::GetSolarMutex() ); - pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); + pToolBox->SetAlign( ImplConvertAlignment(rElement.m_aDockedData.m_nDockedArea ) ); pToolBox->SetLineCount( 1 ); xDockWindow->setFloatingMode( sal_False ); if ( rElement.m_aDockedData.m_bLocked ) @@ -1503,7 +1503,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno xWindow->setOutputSize( AWTSize( aSize) ); if ( pWindow ) - { + { vos::OGuard aGuard( Application::GetSolarMutex() ); if ( !bShowElement ) pWindow->Hide(); @@ -1773,7 +1773,7 @@ void ToolbarLayoutManager::implts_writeNewWindowStateData( const rtl::OUString a if( xWindow2.is() ) { aPos = xWindow2->getPosSize(); - aSize = xWindow2->getOutputSize(); // always use output size for consistency + aSize = xWindow2->getOutputSize(); // always use output size for consistency bVisible = xWindow2->isVisible(); } @@ -1802,7 +1802,7 @@ UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName ) { static UIElement aEmptyElement; UIElementVector::iterator pIter; - + ReadGuard aReadLock( m_aLock ); for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) { @@ -1875,18 +1875,18 @@ bool ToolbarLayoutManager::implts_insertToolbar( const UIElement& rUIElement ) UIElement aTempData; bool bFound( false ); bool bResult( false ); - + aTempData = implts_findToolbar( rUIElement.m_aName ); if ( aTempData.m_aName == rUIElement.m_aName ) bFound = true; - + if ( !bFound ) { WriteGuard aWriteLock( m_aLock ); m_aUIElements.push_back( rUIElement ); bResult = true; } - + return bResult; } @@ -2075,7 +2075,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD uno::Reference< awt::XWindow > xWindow; uno::Reference< ui::XUIElement > xUIElement( rElement.m_xUIElement ); awt::Rectangle aPosSize; - + if ( !lcl_checkUIElement(xUIElement,aPosSize,xWindow) ) continue; if ( isHorizontalDockingArea( eDockingArea )) @@ -2434,7 +2434,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre { // Retrieve output size from container Window vos::OGuard aGuard( Application::GetSolarMutex() ); - pDockingWindow = VCLUnoHelper::GetWindow( xDockingWindow ); + pDockingWindow = VCLUnoHelper::GetWindow( xDockingWindow ); if ( pDockingWindow ) aDockingWinSize = pDockingWindow->GetOutputSizePixel(); } @@ -2466,7 +2466,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre SingleRowColumnWindowData& rRowColumnWindowData = aRowColumnsWindowData[i]; if (( DockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM ) || - ( DockingArea == ui::DockingArea_DOCKINGAREA_RIGHT )) + ( DockingArea == ui::DockingArea_DOCKINGAREA_RIGHT )) nPixelPos += rRowColumnWindowData.nStaticSize; if ((( nMaxSpace - rRowColumnWindowData.nVarSize ) >= nNeededSpace ) || @@ -2530,7 +2530,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre } } - if (( DockingArea == ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT )) + if (( DockingArea == ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea == ui::DockingArea_DOCKINGAREA_LEFT )) nPixelPos += rRowColumnWindowData.nStaticSize; } @@ -2545,7 +2545,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre { if ( DockingArea == ui::DockingArea_DOCKINGAREA_BOTTOM ) nFreeRowColPixelPos = aDockingWinSize.Height() - aUIElementSize.Height(); - else if ( DockingArea == ui::DockingArea_DOCKINGAREA_RIGHT ) + else if ( DockingArea == ui::DockingArea_DOCKINGAREA_RIGHT ) nFreeRowColPixelPos = aDockingWinSize.Width() - aUIElementSize.Width(); } @@ -2564,7 +2564,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre } } -void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( +void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockingArea, sal_Int32 nOffset, SingleRowColumnWindowData& rRowColumnWindowData, @@ -2759,7 +2759,7 @@ void ToolbarLayoutManager::implts_setLayoutInProgress( bool bInProgress ) aRect.Top() -= nHotZoneOffset; aRect.Right() += nHotZoneOffset; aRect.Bottom() += nHotZoneOffset; - + return aRect; } @@ -2898,7 +2898,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( { if ( bHorizontalDockArea ) { - sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32( aContainerWinSize.Width() - aWindowRect.Left() ), + sal_Int32 nSize = ::std::max( sal_Int32( 0 ), std::min( sal_Int32( aContainerWinSize.Width() - aWindowRect.Left() ), sal_Int32( aTrackingRect.getWidth() ))); if ( nSize == 0 ) nSize = aWindowRect.getWidth(); @@ -2987,7 +2987,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize( else { if ((( nRowCol == nMinRowCol ) && ( rDockingOperation == DOCKOP_BEFORE_COLROW )) || - (( nRowCol == nMaxRowCol ) && ( rDockingOperation == DOCKOP_AFTER_COLROW ))) + (( nRowCol == nMaxRowCol ) && ( rDockingOperation == DOCKOP_AFTER_COLROW ))) bOpOutsideOfDockingArea = true; else { @@ -3360,7 +3360,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( //--------------------------------------------------------------------------------------------------------- // XWindowListener //--------------------------------------------------------------------------------------------------------- -void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent ) +void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent ) throw( uno::RuntimeException ) { WriteGuard aWriteLock( m_aLock ); @@ -3383,19 +3383,19 @@ throw( uno::RuntimeException ) if ( aUIElement.m_bFloating ) { uno::Reference< awt::XWindow2 > xWindow2( xWindow, uno::UNO_QUERY ); - + if( xWindow2.is() ) { awt::Rectangle aPos = xWindow2->getPosSize(); - awt::Size aSize = xWindow2->getOutputSize(); // always use output size for consistency + awt::Size aSize = xWindow2->getOutputSize(); // always use output size for consistency bool bVisible = xWindow2->isVisible(); - + // update element data aUIElement.m_aFloatingData.m_aPos = ::Point( aPos.X, aPos.Y ); aUIElement.m_aFloatingData.m_aSize = ::Size( aSize.Width, aSize.Height ); aUIElement.m_bVisible = bVisible; } - + implts_writeWindowStateData( aUIElement ); } else @@ -3410,17 +3410,17 @@ throw( uno::RuntimeException ) } } -void SAL_CALL ToolbarLayoutManager::windowMoved( const awt::WindowEvent& /*aEvent*/ ) +void SAL_CALL ToolbarLayoutManager::windowMoved( const awt::WindowEvent& /*aEvent*/ ) throw( uno::RuntimeException ) { } -void SAL_CALL ToolbarLayoutManager::windowShown( const lang::EventObject& /*aEvent*/ ) +void SAL_CALL ToolbarLayoutManager::windowShown( const lang::EventObject& /*aEvent*/ ) throw( uno::RuntimeException ) { } -void SAL_CALL ToolbarLayoutManager::windowHidden( const lang::EventObject& /*aEvent*/ ) +void SAL_CALL ToolbarLayoutManager::windowHidden( const lang::EventObject& /*aEvent*/ ) throw( uno::RuntimeException ) { } @@ -3428,7 +3428,7 @@ throw( uno::RuntimeException ) //--------------------------------------------------------------------------------------------------------- // XDockableWindowListener //--------------------------------------------------------------------------------------------------------- -void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e ) +void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e ) throw (uno::RuntimeException) { bool bWinFound( false ); @@ -3452,7 +3452,7 @@ throw (uno::RuntimeException) if ( aUIElement.m_xUIElement.is() && xWindow.is() ) { awt::Rectangle aRect; - + bWinFound = true; uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); if ( xDockWindow->isFloating() ) @@ -3482,7 +3482,7 @@ throw (uno::RuntimeException) aWriteLock.unlock(); } -awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e ) +awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent& e ) throw (uno::RuntimeException) { const sal_Int32 MAGNETIC_DISTANCE_UNDOCK = 25; @@ -3658,7 +3658,7 @@ throw (uno::RuntimeException) return aDockingData; } -void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e ) +void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e ) throw (uno::RuntimeException) { bool bDockingInProgress( false ); @@ -3743,7 +3743,7 @@ throw (uno::RuntimeException) } implts_sortUIElements(); - + aWriteLock.lock(); m_bDockingInProgress = sal_False; m_bLayoutDirty = !bStartDockFloated || !bFloating; @@ -3754,7 +3754,7 @@ throw (uno::RuntimeException) m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED ); } -sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e ) +sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e ) throw (uno::RuntimeException) { ReadGuard aReadLock( m_aLock ); @@ -3796,7 +3796,7 @@ throw (uno::RuntimeException) return sal_True; } -void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e ) +void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject& e ) throw (uno::RuntimeException) { UIElement aUIDockingElement; @@ -3824,7 +3824,7 @@ throw (uno::RuntimeException) { aUIDockingElement = implts_findToolbar( e.Source ); bool bWinFound = ( aUIDockingElement.m_aName.getLength() > 0 ); - + if ( bWinFound && xWindow.is() ) { aUIDockingElement.m_bFloating = !aUIDockingElement.m_bFloating; @@ -3900,7 +3900,7 @@ throw (uno::RuntimeException) implts_writeWindowStateData( aUIDockingElement ); implts_sortUIElements(); implts_setLayoutDirty(); - + aReadLock.lock(); ILayoutNotifications* pParentLayouter( m_pParentLayouter ); aReadLock.unlock(); @@ -3927,7 +3927,7 @@ throw (uno::RuntimeException) } } -void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e ) +void SAL_CALL ToolbarLayoutManager::closed( const lang::EventObject& e ) throw (uno::RuntimeException) { rtl::OUString aName; @@ -3947,7 +3947,7 @@ throw (uno::RuntimeException) // user closes a toolbar => // context sensitive toolbar: only destroy toolbar and store state. - // context sensitive toolbar: make it invisible, store state and destroy it. + // non-context sensitive toolbar: make it invisible, store state and destroy it. if ( !pIter->m_bContextSensitive ) pIter->m_bVisible = sal_False; @@ -3966,7 +3966,7 @@ throw (uno::RuntimeException) } } -void SAL_CALL ToolbarLayoutManager::endPopupMode( const awt::EndPopupModeEvent& /*e*/ ) +void SAL_CALL ToolbarLayoutManager::endPopupMode( const awt::EndPopupModeEvent& /*e*/ ) throw (uno::RuntimeException) { } @@ -3974,7 +3974,7 @@ throw (uno::RuntimeException) //--------------------------------------------------------------------------------------------------------- // XUIConfigurationListener //--------------------------------------------------------------------------------------------------------- -void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent ) +void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent ) throw (uno::RuntimeException) { UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL ); @@ -4022,7 +4022,7 @@ throw (uno::RuntimeException) { vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = getWindowFromXUIElement( xUIElement ); - if ( pWindow ) + if ( pWindow ) pWindow->SetText( aUIName ); } @@ -4032,7 +4032,7 @@ throw (uno::RuntimeException) } } -void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent& rEvent ) +void SAL_CALL ToolbarLayoutManager::elementRemoved( const ui::ConfigurationEvent& rEvent ) throw (uno::RuntimeException) { ReadGuard aReadLock( m_aLock ); @@ -4040,7 +4040,7 @@ throw (uno::RuntimeException) uno::Reference< ui::XUIConfigurationManager > xModuleCfgMgr( m_xModuleCfgMgr ); uno::Reference< ui::XUIConfigurationManager > xDocCfgMgr( m_xDocCfgMgr ); aReadLock.unlock(); - + UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL ); uno::Reference< ui::XUIElementSettings > xElementSettings( aUIElement.m_xUIElement, uno::UNO_QUERY ); if ( xElementSettings.is() ) @@ -4080,7 +4080,7 @@ throw (uno::RuntimeException) } } -void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEvent& rEvent ) +void SAL_CALL ToolbarLayoutManager::elementReplaced( const ui::ConfigurationEvent& rEvent ) throw (uno::RuntimeException) { UIElement aUIElement = implts_findToolbar( rEvent.ResourceURL ); @@ -4102,7 +4102,7 @@ throw (uno::RuntimeException) if ( rEvent.Source == xElementCfgMgr ) { xElementSettings->updateSettings(); - + WriteGuard aWriteLock( m_aLock ); bool bNotify = !aUIElement.m_bFloating; m_bLayoutDirty = bNotify; @@ -4123,7 +4123,7 @@ uno::Reference< ui::XUIElement > ToolbarLayoutManager::getToolbar( const ::rtl:: uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolbars() { uno::Sequence< uno::Reference< ui::XUIElement > > aSeq; - + ReadGuard aReadLock( m_aLock ); if ( m_aUIElements.size() > 0 ) { @@ -4158,7 +4158,7 @@ bool ToolbarLayoutManager::floatToolbar( const ::rtl::OUString& rResourceURL ) xDockWindow->setFloatingMode( true ); implts_setLayoutDirty(); - implts_setToolbar( aUIElement ); + implts_setToolbar( aUIElement ); return true; } } @@ -4183,7 +4183,7 @@ bool ToolbarLayoutManager::lockToolbar( const ::rtl::OUString& rResourceURL ) xDockWindow->lock(); implts_setLayoutDirty(); - implts_setToolbar( aUIElement ); + implts_setToolbar( aUIElement ); return true; } } @@ -4208,7 +4208,7 @@ bool ToolbarLayoutManager::unlockToolbar( const ::rtl::OUString& rResourceURL ) xDockWindow->unlock(); implts_setLayoutDirty(); - implts_setToolbar( aUIElement ); + implts_setToolbar( aUIElement ); return true; } } @@ -4233,7 +4233,7 @@ bool ToolbarLayoutManager::isToolbarFloating( const ::rtl::OUString& rResourceUR bool ToolbarLayoutManager::isToolbarDocked( const ::rtl::OUString& rResourceURL ) { return !isToolbarFloating( rResourceURL ); -} +} bool ToolbarLayoutManager::isToolbarLocked( const ::rtl::OUString& rResourceURL ) { @@ -4244,7 +4244,7 @@ bool ToolbarLayoutManager::isToolbarLocked( const ::rtl::OUString& rResourceURL awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResourceURL ) { Window* pWindow = implts_getWindow( rResourceURL ); - + vos::OGuard aGuard( Application::GetSolarMutex() ); if ( pWindow ) { @@ -4261,8 +4261,8 @@ awt::Size ToolbarLayoutManager::getToolbarSize( const ::rtl::OUString& rResource awt::Point ToolbarLayoutManager::getToolbarPos( const ::rtl::OUString& rResourceURL ) { awt::Point aPos; - UIElement aUIElement = implts_findToolbar( rResourceURL ); - + UIElement aUIElement = implts_findToolbar( rResourceURL ); + uno::Reference< awt::XWindow > xWindow( implts_getXWindow( rResourceURL )); if ( xWindow.is() ) { @@ -4279,7 +4279,7 @@ awt::Point ToolbarLayoutManager::getToolbarPos( const ::rtl::OUString& rResource aPos.Y = aVirtualPos.Y(); } } - + return aPos; } @@ -4288,7 +4288,7 @@ void ToolbarLayoutManager::setToolbarSize( const ::rtl::OUString& rResourceURL, uno::Reference< awt::XWindow2 > xWindow( implts_getXWindow( rResourceURL ), uno::UNO_QUERY ); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); UIElement aUIElement = implts_findToolbar( rResourceURL ); - + if ( xWindow.is() && xDockWindow.is() && xDockWindow->isFloating() ) { xWindow->setOutputSize( aSize ); @@ -4304,7 +4304,7 @@ void ToolbarLayoutManager::setToolbarPos( const ::rtl::OUString& rResourceURL, c uno::Reference< awt::XWindow > xWindow( implts_getXWindow( rResourceURL )); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); UIElement aUIElement = implts_findToolbar( rResourceURL ); - + if ( xWindow.is() && xDockWindow.is() && xDockWindow->isFloating() ) { xWindow->setPosSize( aPos.X, aPos.Y, 0, 0, awt::PosSize::POS ); @@ -4322,3 +4322,4 @@ void ToolbarLayoutManager::setToolbarPosSize( const ::rtl::OUString& rResourceUR } } // namespace framework + diff --git a/main/framework/source/tabwin/tabwindow.cxx b/main/framework/source/tabwin/tabwindow.cxx index fc9d735..1ba2c21 100644 --- a/main/framework/source/tabwin/tabwindow.cxx +++ b/main/framework/source/tabwin/tabwindow.cxx @@ -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. - * + * *************************************************************/ @@ -138,12 +138,12 @@ void TabWindow::implts_LayoutWindows() const aLock.unlock(); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - // Convert relativ size to output size. + // Convert relative size to output size. if ( xWindow.is() && xDevice.is() ) { css::awt::Rectangle aRectangle = xWindow->getPosSize(); css::awt::DeviceInfo aInfo = xDevice->getInfo(); - css::awt::Size aSize ( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset , + css::awt::Size aSize ( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset , aRectangle.Height - aInfo.TopInset - aInfo.BottomInset ); css::awt::Size aContainerWindowSize; @@ -285,7 +285,7 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl ) } //--------------------------------------------------------------------------------------------------------- -// XInitilization +// XInitialization //--------------------------------------------------------------------------------------------------------- void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) @@ -878,7 +878,7 @@ throw( css::uno::Exception ) { } -void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , +void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , sal_Int32 nHandle ) const { switch( nHandle ) @@ -895,7 +895,7 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , ::cppu::IPropertyArrayHelper& SAL_CALL TabWindow::getInfoHelper() { // Optimize this method ! - // We initialize a static variable only one time. And we don't must use a mutex at every call! + // We initialize a static variable only one time. And we don't need to use a mutex at every call! // For the first call; pInfoHelper is NULL - for the second call pInfoHelper is different from NULL! static ::cppu::OPropertyArrayHelper* pInfoHelper = NULL; @@ -922,7 +922,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL TabWindow::getPrope throw ( css::uno::RuntimeException ) { // Optimize this method ! - // We initialize a static variable only one time. And we don't must use a mutex at every call! + // We initialize a static variable only one time. And we don't need to use a mutex at every call! // For the first call; pInfo is NULL - for the second call pInfo is different from NULL! static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL; @@ -946,7 +946,7 @@ throw ( css::uno::RuntimeException ) const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticPropertyDescriptor() { // Create a new static property array to initialize sequence! - // Table of all predefined properties of this class. Its used from OPropertySetHelper-class! + // Table of all predefined properties of this class. It's used from OPropertySetHelper-class! // Don't forget to change the defines (see begin of this file), if you add, change or delete a property in this list!!! // It's necessary for methods of OPropertySetHelper. // ATTENTION: @@ -970,3 +970,4 @@ const css::uno::Sequence< css::beans::Property > TabWindow::impl_getStaticProper } } +