summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xframework/inc/classes/filtercachedata.hxx55
-rwxr-xr-xframework/inc/classes/framecontainer.hxx8
-rwxr-xr-xframework/inc/classes/menumanager.hxx4
-rwxr-xr-xframework/inc/dispatch/dispatchprovider.hxx3
-rwxr-xr-xframework/inc/framework/actiontriggerhelper.hxx4
-rwxr-xr-xframework/inc/framework/eventsconfiguration.hxx3
-rwxr-xr-xframework/inc/framework/imagesconfiguration.hxx3
-rwxr-xr-xframework/inc/framework/menuconfiguration.hxx4
-rwxr-xr-xframework/inc/framework/toolboxconfiguration.hxx4
-rwxr-xr-xframework/inc/helper/statusindicatorfactory.hxx8
-rwxr-xr-xframework/inc/macros/debug/assertion.hxx4
-rwxr-xr-xframework/inc/services/contenthandlerfactory.hxx1
-rwxr-xr-xframework/inc/services/license.hxx16
-rwxr-xr-xframework/inc/services/logindialog.hxx2
-rwxr-xr-xframework/inc/services/tabwindowservice.hxx6
-rwxr-xr-xframework/inc/services/task.hxx124
-rwxr-xr-xframework/inc/uielement/menubarmanager.hxx4
-rwxr-xr-xframework/inc/uielement/menubarwrapper.hxx1
-rwxr-xr-xframework/inc/uifactory/factoryconfiguration.hxx1
-rwxr-xr-xframework/inc/uifactory/statusbarfactory.hxx1
-rwxr-xr-xframework/inc/uifactory/toolboxfactory.hxx1
-rwxr-xr-xframework/inc/xml/menudocumenthandler.hxx5
-rwxr-xr-xframework/qa/complex/api_internal/CheckAPI.java7
-rwxr-xr-xframework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java5
-rwxr-xr-xframework/qa/complex/desktop/DesktopTerminate.java1
-rwxr-xr-xframework/qa/complex/dispatches/Interceptor.java3
-rwxr-xr-xframework/qa/complex/framework/autosave/AutoSave.java10
-rwxr-xr-xframework/qa/complex/framework/recovery/RecoveryTest.java24
-rwxr-xr-xframework/qa/complex/imageManager/CheckImageManager.java28
-rwxr-xr-xframework/qa/complex/imageManager/_XComponent.java1
-rwxr-xr-xframework/qa/complex/imageManager/_XInitialization.java1
-rwxr-xr-xframework/qa/complex/imageManager/_XUIConfiguration.java1
-rwxr-xr-xframework/qa/complex/loadAllDocuments/InteractionHandler.java3
-rwxr-xr-xframework/qa/complex/loadAllDocuments/StatusIndicator.java20
-rwxr-xr-xframework/qa/complex/loadAllDocuments/StreamSimulator.java6
-rwxr-xr-xframework/qa/complex/path_settings/PathSettingsTest.java1
-rwxr-xr-xframework/source/accelerators/documentacceleratorconfiguration.cxx9
-rwxr-xr-xframework/source/accelerators/moduleacceleratorconfiguration.cxx1
-rwxr-xr-xframework/source/classes/framecontainer.cxx12
-rwxr-xr-xframework/source/classes/fwktabwindow.cxx1
-rwxr-xr-xframework/source/classes/menumanager.cxx28
-rwxr-xr-xframework/source/dispatch/closedispatcher.cxx1
-rwxr-xr-xframework/source/dispatch/menudispatcher.cxx8
-rwxr-xr-xframework/source/dispatch/oxt_handler.cxx11
-rwxr-xr-xframework/source/fwe/helper/actiontriggerhelper.cxx1
-rwxr-xr-xframework/source/fwe/xml/eventsconfiguration.cxx10
-rwxr-xr-xframework/source/fwe/xml/imagesconfiguration.cxx9
-rwxr-xr-xframework/source/fwe/xml/menuconfiguration.cxx1
-rwxr-xr-xframework/source/fwe/xml/menudocumenthandler.cxx9
-rwxr-xr-xframework/source/fwe/xml/toolboxconfiguration.cxx4
-rwxr-xr-xframework/source/fwi/helper/mischelper.cxx2
-rwxr-xr-xframework/source/helper/dockingareadefaultacceptor.cxx4
-rwxr-xr-xframework/source/helper/statusindicatorfactory.cxx6
-rwxr-xr-xframework/source/helper/uiconfigelementwrapperbase.cxx4
-rwxr-xr-xframework/source/jobs/job.cxx3
-rwxr-xr-xframework/source/layoutmanager/layoutmanager.cxx1
-rwxr-xr-xframework/source/loadenv/loadenv.cxx136
-rwxr-xr-xframework/source/services/autorecovery.cxx4
-rwxr-xr-xframework/source/services/backingcomp.cxx6
-rwxr-xr-xframework/source/services/desktop.cxx12
-rwxr-xr-xframework/source/services/dispatchhelper.cxx1
-rwxr-xr-xframework/source/services/frame.cxx6
-rwxr-xr-xframework/source/services/license.cxx13
-rwxr-xr-xframework/source/services/mediatypedetectionhelper.cxx1
-rwxr-xr-xframework/source/services/pathsettings.cxx16
-rwxr-xr-xframework/source/services/sessionlistener.cxx1
-rwxr-xr-xframework/source/services/substitutepathvars.cxx5
-rwxr-xr-xframework/source/services/taskcreatorsrv.cxx3
-rwxr-xr-xframework/source/tabwin/tabwindow.cxx1
-rwxr-xr-xframework/source/tabwin/tabwinfactory.cxx1
-rwxr-xr-xframework/source/uiconfiguration/globalsettings.cxx2
-rwxr-xr-xframework/source/uiconfiguration/moduleuiconfigurationmanager.cxx1
-rwxr-xr-xframework/source/uiconfiguration/uicategorydescription.cxx2
-rwxr-xr-xframework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx15
-rwxr-xr-xframework/source/uiconfiguration/windowstateconfiguration.cxx4
-rwxr-xr-xframework/source/uielement/controlmenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/fontmenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/fontsizemenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/footermenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/headermenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/langselectionmenucontroller.cxx3
-rwxr-xr-xframework/source/uielement/langselectionstatusbarcontroller.cxx9
-rwxr-xr-xframework/source/uielement/macrosmenucontroller.cxx5
-rwxr-xr-xframework/source/uielement/menubarmanager.cxx17
-rwxr-xr-xframework/source/uielement/menubarwrapper.cxx2
-rwxr-xr-xframework/source/uielement/newmenucontroller.cxx11
-rwxr-xr-xframework/source/uielement/objectmenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/recentfilesmenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/toolbarmanager.cxx18
-rwxr-xr-xframework/source/uielement/toolbarsmenucontroller.cxx1
-rwxr-xr-xframework/source/uielement/uicommanddescription.cxx3
-rwxr-xr-xframework/source/uifactory/addonstoolboxfactory.cxx1
-rwxr-xr-xframework/source/uifactory/factoryconfiguration.cxx2
-rwxr-xr-xframework/source/uifactory/menubarfactory.cxx1
-rwxr-xr-xframework/source/uifactory/popupmenucontrollerfactory.cxx2
-rwxr-xr-xframework/source/uifactory/statusbarcontrollerfactory.cxx2
-rwxr-xr-xframework/source/uifactory/statusbarfactory.cxx1
-rwxr-xr-xframework/source/uifactory/toolbarcontrollerfactory.cxx2
-rwxr-xr-xframework/source/uifactory/toolboxfactory.cxx1
-rwxr-xr-xframework/source/uifactory/uielementfactorymanager.cxx2
-rwxr-xr-xframework/source/uifactory/windowcontentfactorymanager.cxx27
-rwxr-xr-xframework/test/test.cxx46
-rwxr-xr-xframework/test/test_filterregistration.bas2
-rwxr-xr-xframework/test/threadtest/threadtest.cxx5
-rwxr-xr-xframework/test/typecfg/cfgview.cxx10
-rwxr-xr-xframework/test/typecfg/xml2xcd.cxx20
106 files changed, 44 insertions, 884 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index f92da9cae2d1..ba77457f5ada 100755
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -799,61 +799,6 @@ class FilterCFGAccess : public ::utl::ConfigItem
::rtl::OUString m_sProductName ;
::rtl::OUString m_sFormatVersion ;
};
-/*DRAFT
-class FilterCFGListener : public css::util::XChangesListener
- , private ThreadHelpBase
- , public ::cppu::OWeakObject
-{
- public:
-
- enum ECFGType
- {
- E_TYPE ,
- E_FILTER ,
- E_LOADER ,
- E_DETECTOR ,
- E_CONTENTHANDLER
- };
-
- private:
-
- // read only access to the configuration, where we are regsieterd as changes listener.
- css::uno::Reference< css::uno::XInterface > m_xCFG;
-
- // indicates, for which type of configuration item we listen.
- ECFGType m_eType;
-
- DataContainer* m_pData;
-
- // we must know, if we are already registered as listener or not.
- // That can be usefull to supress double registration calls ...
- // which may will force double call backs in our disposing method!
- // Such superflous calls can be dangerous.
- sal_Bool m_bListening;
-
- public:
-
- DECLARE_XINTERFACE
-
- FilterCFGListener( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
- ECFGType eType ,
- DataContainer* pData );
-
- void startListening();
- void stopListening ();
-
- virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& aEvent ) throw(css::uno::RuntimeException);
- virtual void SAL_CALL disposing ( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException);
-
- private:
-
- FileType impl_readType ( const css::uno::Reference< css::uno::XInterface >& xNode );
- Filter impl_readFilter ( const css::uno::Reference< css::uno::XInterface >& xNode );
- Detector impl_readDetector( const css::uno::Reference< css::uno::XInterface >& xNode );
- Loader impl_readLoader ( const css::uno::Reference< css::uno::XInterface >& xNode );
- ContentHandler impl_readHandler ( const css::uno::Reference< css::uno::XInterface >& xNode );
-};
-*/
} // namespace framework
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 1ac62b8278ef..f96a0373c1ca 100755
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -103,14 +103,6 @@ class FrameContainer : private ThreadHelpBase
TFrameContainer m_aContainer;
/// one container item can be the current active frame. Its neccessary for Desktop or Frame implementation.
css::uno::Reference< css::frame::XFrame > m_xActiveFrame;
-/*DEPRECATEME
- /// indicates using of the automatic async quit feature in case last task will be closed
- sal_Bool m_bAsyncQuit;
- /// used to execute the terminate request asyncronous
- ::vcl::EventPoster m_aAsyncCall;
- /// used for async quit feature (must be weak to prevent us against strange situations!)
- css::uno::WeakReference< css::frame::XDesktop > m_xDesktop;
-*/
//_______________________________________
// interface
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 62432f05543b..3920890e02c7 100755
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -53,7 +53,6 @@
#include <threadhelp/threadhelpbase.hxx>
#include <macros/debug.hxx>
-// #110897#
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#define REFERENCE ::com::sun::star::uno::Reference
@@ -76,7 +75,6 @@ class MenuManager : public ThreadHelpBase ,
public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XStatusListener >
{
public:
- // #110897#
MenuManager(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
REFERENCE< XFRAME >& rFrame,
@@ -98,7 +96,6 @@ class MenuManager : public ThreadHelpBase ,
void RemoveListener();
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
static void UpdateSpecialWindowMenu( Menu* pMenu ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,IMutex& _rMutex);
@@ -154,7 +151,6 @@ class MenuManager : public ThreadHelpBase ,
REFERENCE< XFRAME > m_xFrame;
::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector;
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
};
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index b07a27a890ae..9e095f69855a 100755
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -125,9 +125,6 @@ class DispatchProvider : // interfaces
/// different dispatcher to handle special dispatch calls, protocols or URLs (they will be created on demand.)
css::uno::Reference< css::frame::XDispatch > m_xMenuDispatcher ;
css::uno::Reference< css::frame::XDispatch > m_xHelpAgentDispatcher;
-/* css::uno::Reference< css::frame::XDispatch > m_xBlankDispatcher ;
- css::uno::Reference< css::frame::XDispatch > m_xSelfDispatcher ;
- css::uno::Reference< css::frame::XDispatch > m_xDefaultDispatcher ;*/
/// cache of some other dispatch provider which are registered inside configuration to handle special URL protocols
HandlerCache m_aProtocolHandlerCache;
diff --git a/framework/inc/framework/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx
index f7b00f745006..78983cd2341d 100755
--- a/framework/inc/framework/actiontriggerhelper.hxx
+++ b/framework/inc/framework/actiontriggerhelper.hxx
@@ -30,8 +30,6 @@
#define __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
#include <com/sun/star/container/XIndexContainer.hpp>
-
-// #110897#
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <vcl/menu.hxx>
#include <framework/fwedllapi.h>
@@ -56,11 +54,9 @@ namespace framework
// to optimize the time of creation of a menu from a actiontrigger structure.
// IMPORTANT: The caller must ensure that the menu pointer is valid through the
// life time of the XIndexContainer object!!!
- //
// @param pNewMenu = Must be a valid menu. Please be aware that this implementation is based on
// the above mentioned restriction!!!
- // #110897#
static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Menu* pMenu, const ::rtl::OUString* pMenuIdentifier );
diff --git a/framework/inc/framework/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx
index 4c07be58d1c7..97e142936f89 100755
--- a/framework/inc/framework/eventsconfiguration.hxx
+++ b/framework/inc/framework/eventsconfiguration.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-// #110897#
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
namespace framework
@@ -50,12 +49,10 @@ struct FWE_DLLPUBLIC EventsConfig
class FWE_DLLPUBLIC EventsConfiguration
{
public:
- // #110897#
static sal_Bool LoadEventsConfig(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rInStream, EventsConfig& aItems );
- // #110897#
static sal_Bool StoreEventsConfig(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const EventsConfig& aItems );
diff --git a/framework/inc/framework/imagesconfiguration.hxx b/framework/inc/framework/imagesconfiguration.hxx
index 90f9f4e9988b..2083a86945c8 100755
--- a/framework/inc/framework/imagesconfiguration.hxx
+++ b/framework/inc/framework/imagesconfiguration.hxx
@@ -35,7 +35,6 @@
#include <tools/stream.hxx>
#include <tools/color.hxx>
-// #110897#
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
@@ -103,12 +102,10 @@ struct FWE_DLLPUBLIC ImageListsDescriptor
class FWE_DLLPUBLIC ImagesConfiguration
{
public:
- // #110897#
static sal_Bool LoadImages(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rInStream, ImageListsDescriptor& aItems );
- // #110897#
static sal_Bool StoreImages(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const ImageListsDescriptor& aItems );
diff --git a/framework/inc/framework/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx
index 29899e5373b0..1671a594ec06 100755
--- a/framework/inc/framework/menuconfiguration.hxx
+++ b/framework/inc/framework/menuconfiguration.hxx
@@ -88,7 +88,7 @@ class FWE_DLLPUBLIC MenuConfiguration
};
MenuConfiguration(
- // #110897#-1 use const when giving a uno reference by reference
+ // use const when giving a uno reference by reference
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
virtual ~MenuConfiguration();
@@ -118,7 +118,7 @@ class FWE_DLLPUBLIC MenuConfiguration
static sal_Bool IsWindowListItemId( sal_uInt16 nId );
private:
- // #110897#-1 do not hold the uno reference by reference
+ // do not hold the uno reference by reference
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager;
};
diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index 313479ec4752..63abfcd4824d 100755
--- a/framework/inc/framework/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -38,8 +38,6 @@
#endif
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-
-// #110897#
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
namespace framework
@@ -48,13 +46,11 @@ namespace framework
class FWE_DLLPUBLIC ToolBoxConfiguration
{
public:
- // #110897#
static sal_Bool LoadToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration );
- // #110897#
static sal_Bool StoreToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index e84283fd0f70..a01bf9570296 100755
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -146,14 +146,6 @@ struct IndicatorInfo
return (m_xIndicator == xIndicator);
}
};
-/*
- //---------------------------------------------------------------------------------------------------------
- // norm nValue to fit range of 0..100%
- sal_Int32 calcPercentage()
- {
- return ::std::min( (( m_nValue * 100 )/ ::std::max( m_nRange, (sal_Int32)1 ) ), (sal_Int32)100 );
- }
-*/
//===============================================
/** @descr Define a lits of child indicator objects and her data. */
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index 0785b24c4611..5f4e3097e22e 100755
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -50,15 +50,11 @@
// 1) LOGTYPE use it to define the output of all assertions, errors, exception infos
// 2) LOGFILE_ASSERTIONS use it to define the file name to log assertions if LOGTYPE=LOGTYPE_FILE...
// 3) LOGFILE_WARNINGS use it to define the file name to log warnings if LOGTYPE=LOGTYPE_FILE...
-//
// active for "non product":
-//
// 4) LOG_ASSERT( BCONDITION, STEXT ) assert some critical errors wich depend from given condition
// 4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) same like 4) + additional location of error
// 5) LOG_ERROR( SMETHOD, STEXT ) show errors without any condition
-//
// active for debug only!
-//
// 6) LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) show/log an exception for easier debug
// 7) LOG_WARNING( SMETHOD, STEXT ) should be used to detect leaks in algorithm, mechanism or operation handling
//*****************************************************************************************************************
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index c15887529231..80c0d7395465 100755
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -232,7 +232,6 @@ class ContentHandlerFactory : // interfaces
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ;
FilterCache m_aCache ;
-// ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer ;
}; // class ContentHandlerFactory
diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx
index b64fedbe53f3..25df65685257 100755
--- a/framework/inc/services/license.hxx
+++ b/framework/inc/services/license.hxx
@@ -89,27 +89,11 @@ namespace framework
FWK_DECLARE_XTYPEPROVIDER
DECLARE_XSERVICEINFO
- /*
- XJob...
- any execute([in] sequence< ::com::sun::star::beans::NamedValue > Arguments )
- raises(
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::Exception );
- */
virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence<css::beans::NamedValue>& args)
throw( css::lang::IllegalArgumentException, css::uno::Exception);
- /*
- XCLoseable
- void close( [in] boolean DeliverOwnership ) raises(CloseVetoException );
- */
virtual void SAL_CALL close(sal_Bool bDeliverOwnership) throw (css::util::CloseVetoException);
- /*
- XCloseVroadcaster
- [oneway] void addCloseListener([in] XCloseListenerListener );
- [oneway] void removeCloseListener([in] XCloseListenerListener );
- */
virtual void SAL_CALL addCloseListener(const css::uno::Reference< css::util::XCloseListener >& aListener) throw (css::uno::RuntimeException);
virtual void SAL_CALL removeCloseListener(const css::uno::Reference< css::util::XCloseListener >& aListener) throw (css::uno::RuntimeException);
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 0fc6ec6cb914..50ac0c7d7879 100755
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -121,11 +121,9 @@ namespace framework{
// UseProxy=[browser|custom|none]
// SecurityProxy=so-webcache:3128
// dialog=[big|small]
-//
// [DefaultPorts]
// https=8445
// http=8090
-//
// [ServerHistory]
// Server_1=localhost
// Server_2=munch:7202
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index 2c5f6968d726..d0cdfe60c317 100755
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -188,12 +188,6 @@ class TabWindowService : public css::lang::XTypeProvider
void impl_checkTabIndex (::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
TTabPageInfoHash::iterator impl_getTabPageInfo(::sal_Int32 nID) throw (css::lang::IndexOutOfBoundsException);
FwkTabWindow* mem_TabWin ();
-/*
- ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
- const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
- static css::uno::Reference < css::beans::XPropertySetInfo > SAL_CALL
- createPropertySetInfo( ::cppu::IPropertyArrayHelper& rProperties ) SAL_THROW( () );
-*/
//-------------------------------------------------------------------------------------------------------------
// variables
// (should be private everyway!)
diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx
index 8232bf4fc6e6..c2b411b2042a 100755
--- a/framework/inc/services/task.hxx
+++ b/framework/inc/services/task.hxx
@@ -424,109 +424,7 @@ class Task : public css::frame::XTask , // => XFrame => XComponent
protected:
- //---------------------------------------------------------------------------
- // OPropertySetHelper
- //---------------------------------------------------------------------------
- /*-****************************************************************************************************//**
- @short try to convert a property value
- @descr This method is calling from helperclass "OPropertySetHelper".
- Don't use this directly!
- You must try to convert the value of given propertyhandle and
- return results of this operation. This will be use to ask vetoable
- listener. If no listener have a veto, we will change value realy!
- ( in method setFastPropertyValue_NoBroadcast(...) )
-
- @seealso OPropertySetHelper
- @seealso setFastPropertyValue_NoBroadcast()
-
- @param "aConvertedValue" new converted value of property
- @param "aOldValue" old value of property
- @param "nHandle" handle of property
- @param "aValue" new value of property
-
- @return sal_True if value will be changed, sal_FALSE otherway
-
- @onerror IllegalArgumentException, if you call this with an invalid argument
- *//*-*****************************************************************************************************/
-/*
- virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue ,
- css::uno::Any& aOldValue ,
- sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::lang::IllegalArgumentException );
-*/
- /*-****************************************************************************************************//**
- @short set value of a transient property
- @descr This method is calling from helperclass "OPropertySetHelper".
- Don't use this directly!
- Handle and value are valid everyway! You must set the new value only.
- After this, baseclass send messages to all listener automaticly.
-
- @seealso OPropertySetHelper
-
- @param "nHandle" handle of property to change
- @param "aValue" new value of property
-
- @return -
-
- @onerror An exception is thrown.
- *//*-*****************************************************************************************************/
-/*
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const css::uno::Any& aValue ) throw( css::uno::Exception );
-*/
- /*-****************************************************************************************************//**
- @short get value of a transient property
- @descr This method is calling from helperclass "OPropertySetHelper".
- Don't use this directly!
-
- @seealso OPropertySetHelper
-
- @param "nHandle" handle of property to change
- @param "aValue" current value of property
-
- @return -
-
- @onerror -
- *//*-*****************************************************************************************************/
-/*
- virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue ,
- sal_Int32 nHandle ) const;
-*/
- /*-****************************************************************************************************//**
- @short return structure and information about transient properties
- @descr This method is calling from helperclass "OPropertySetHelper".
- Don't use this directly!
-
- @seealso OPropertySetHelper
-
- @param -
-
- @return structure with property-informations
-
- @onerror -
- *//*-*****************************************************************************************************/
-/*
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-*/
- /*-****************************************************************************************************//**
- @short return propertysetinfo
- @descr You can call this method to get information about transient properties
- of this object.
-
- @seealso OPropertySetHelper
- @seealso XPropertySet
- @seealso XMultiPropertySet
-
- @param -
-
- @return reference to object with information [XPropertySetInfo]
-
- @onerror -
- *//*-*****************************************************************************************************/
-/*
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo();
-*/
//-------------------------------------------------------------------------------------------------------------
// private methods
//-------------------------------------------------------------------------------------------------------------
@@ -535,27 +433,7 @@ class Task : public css::frame::XTask , // => XFrame => XComponent
DECL_LINK( Close_Impl, void* );
-// void impl_SaveWindowAttributes();
-
-/* sal_Bool impl_tryToChangeProperty( sal_Bool bProperty ,
- const css::uno::Any& aValue ,
- css::uno::Any& aOldValue ,
- css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
- sal_Bool impl_tryToChangeProperty( const ::rtl::OUString& sProperty ,
- const css::uno::Any& aValue ,
- css::uno::Any& aOldValue ,
- css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
- sal_Bool impl_tryToChangeProperty( const css::awt::Point& aProperty ,
- const css::uno::Any& aValue ,
- css::uno::Any& aOldValue ,
- css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
- sal_Bool impl_tryToChangeProperty( const css::awt::Size& aProperty ,
- const css::uno::Any& aValue ,
- css::uno::Any& aOldValue ,
- css::uno::Any& aConvertedValue ) throw( css::lang::IllegalArgumentException );
-
- static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor();
-*/
+
//-------------------------------------------------------------------------------------------------------------
// debug methods
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index e77147c9cfaa..34b8ae093f07 100755
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -97,7 +97,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
public ::cppu::OWeakObject
{
protected:
- // #110897#
MenuBarManager(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
@@ -106,7 +105,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
sal_Bool bDelete,
sal_Bool bDeleteChildren );
- // #110897#
MenuBarManager(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
@@ -116,7 +114,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
sal_Bool bDeleteChildren );
public:
- // #110897#
MenuBarManager(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
@@ -127,7 +124,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
sal_Bool bDelete,
sal_Bool bDeleteChildren );
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
virtual ~MenuBarManager();
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 81fcb23deed2..7aa5c0a4182c 100755
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -59,7 +59,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
{
public:
- // #110897#
MenuBarWrapper(
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
virtual ~MenuBarWrapper();
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index 46ff30b544d0..b2e00e586b83 100755
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -54,7 +54,6 @@
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index fffb73d9ba00..42f368c5ed97 100755
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -42,7 +42,6 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-//_________________________________________________________________________________________________________________
// includes of other projects
//_________________________________________________________________________________________________________________
#include <rtl/ustring.hxx>
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index 7b868e00e2e4..e006e18d6dbb 100755
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -41,7 +41,6 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-//_________________________________________________________________________________________________________________
// includes of other projects
//_________________________________________________________________________________________________________________
#include <cppuhelper/weak.hxx>
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 6286d6c06087..3c899ed07cd3 100755
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -121,13 +121,11 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // S
class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
{
public:
- // #110897#
OReadMenuDocumentHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer );
virtual ~OReadMenuDocumentHandler();
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
// XDocumentHandler
@@ -165,14 +163,12 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
{
public:
- // #110897#
OReadMenuBarHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer,
const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory );
virtual ~OReadMenuBarHandler();
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
// XDocumentHandler
@@ -204,7 +200,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
}; // OReadMenuBarHandler
diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index be979e9234ac..4539e7a95ce4 100755
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -90,12 +90,6 @@ public class CheckAPI {
System.out.println("Start with test");
// if test is idle for 5 minutes, assume that it hangs and kill it.
// param.put("TimeOut", new Integer("300000"));
-/* AppProvider office = (AppProvider)dcl.getInstance("helper.OfficeProvider");
- Object msf = office.getManager(param);
- if (msf == null) {
- failed("Could not connect an Office.");
- }
- param.put("ServiceFactory",msf); */
XMultiServiceFactory xMSF = getMSF();
Object oObj = null;
try {
@@ -180,7 +174,6 @@ public class CheckAPI {
}
catch(java.lang.InterruptedException e) {}
OfficeProvider op = new OfficeProvider();
- // op.closeExistingOffice(param, true);
xMSF = (XMultiServiceFactory)op.getManager(param);
param.put("ServiceFactory",xMSF);
try {
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 471f5246b787..b017c7b8c470 100755
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -180,8 +180,6 @@ public class CheckContextMenuInterceptor
}
}
- // utils.shortWait(10000);
-
openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc));
checkHelpEntry();
@@ -231,9 +229,6 @@ public class CheckContextMenuInterceptor
xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0));
xRoot = at.getAccessibleObject(xWindow);
-
-// at.printAccessibleTree((PrintWriter)log, xRoot, param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
- // at.printAccessibleTree(System.out, xRoot, true);
}
catch (com.sun.star.lang.IndexOutOfBoundsException e)
{
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 0f385edf0cb0..ae668cbe9209 100755
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -31,7 +31,6 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.frame.XDesktop;
import com.sun.star.uno.UnoRuntime;
import helper.OfficeProvider;
-//import complex.persistent_window_states.helper.DocumentHandle;
// ---------- junit imports -----------------
import org.junit.After;
diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index fc5b57b1215e..366fe3528134 100755
--- a/framework/qa/complex/dispatches/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -45,9 +45,6 @@ import com.sun.star.frame.XStatusListener;
// helper
import com.sun.star.util.URL;
-// others
-//import java.lang.*;
-
// __________ Implementation __________
/**
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 178f9c0af987..7854ee5988a6 100755
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -316,16 +316,6 @@ public class AutoSave
m_aLog.log(Protocol.TYPE_OK, "saveDoc('"+sURL+"') = OK.");
}
-/*
- catch(com.sun.star.io.IOException exIO)
- {
- m_aLog.log(Protocol.TYPE_WARNING , "got IOException on calling doc.store()." );
- m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail." );
- m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesnt show an error!");
- m_aLog.log(Protocol.TYPE_WARNING_INFO, "Message of the original exception:" );
- m_aLog.log(Protocol.TYPE_WARNING_INFO, exIO.getMessage());
- }
-*/
catch(Throwable ex)
{
m_aLog.log(ex);
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 5ea73f6a41d3..d2e3f046848f 100755
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -160,10 +160,7 @@ public class RecoveryTest extends ComplexTestCase {
restoreBackupRecoveryData();
startOffice();
int expectedDocumentCount = 3;
-// handleRecoveryDialog_QuickExit(expectedDocumentCount);
handleRecoveryDialog_QuickExitAndSave(expectedDocumentCount);
- //handleCrashReporterDialog(true, true);
- //checkDocumentCount(expectedDocumentCount);
}
public void before() throws Exception {
@@ -194,7 +191,6 @@ public class RecoveryTest extends ComplexTestCase {
// make window ranges
makeWindowPositionRage();
- //makeRecoveryData();
}
private void makeRecoveryData(){
@@ -482,10 +478,8 @@ public class RecoveryTest extends ComplexTestCase {
rt.pause();
- //XAccessibleContext oButton = oUITools.getButton("Start Recovery >");
int counter = 0;
int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / param.getInt(PropertyName.SHORT_WAIT);
- //boolean enabeld = oButton.getAccessibleStateSet().contains(com.sun.star.accessibility.AccessibleStateType.ENABLED);
XAccessibleContext oButton = null;
while ((oButton == null) && (counter < maximum)){
@@ -632,23 +626,9 @@ public class RecoveryTest extends ComplexTestCase {
// create some documents with content
makeWriterDoc("WriterDoc1", true);
-// makeCalcDoc("CalcDoc1", true);
-// makeDrawDoc("DrawDoc1", true);
-// makeImpressDoc("ImpressDoc1", true);
-// makeMathDoc("MathDoc1", true);
-
- // create some documents without content
-// makeMathDoc("_blank_math", false);
-// makeDrawDoc("_blank_draw", false);
-// makeCalcDoc("_blank_calc", false);
-// makeWriterDoc("_blank_writer", false);
-// makeImpressDoc("_blank_impress", false);
-
-// makeMathDoc("MathDocEmpty", false);
-// makeDrawDoc("DrawDocEmpty", false);
-// makeCalcDoc("CalcDocEmpty", false);
+
+
makeWriterDoc("WriterDocEmpty", false);
-// makeImpressDoc("ImpressDocEmpty", false);
log.println("Test object successfully created.");
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 7db880958ab5..9aff703ee96f 100755
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -42,9 +42,6 @@ public class CheckImageManager {
param.put("ServiceFactory", xMSF); // some qadevOOo functions need the ServiceFactory
}
-// public String[] getTestMethodNames() {
-// return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"};
-// }
@Test public void checkImageManagerFromModule()
{
@@ -163,31 +160,6 @@ public class CheckImageManager {
public void fireEvent() {
// remove for real action:
triggered = !triggered;
-/* try {
- XIndexAccess xMenuBarSettings = xUIManager.getSettings(
- "private:resource/menubar/menubar", true);
-
- }
- catch(com.sun.star.container.NoSuchElementException e) {
- System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
- e.printStackTrace((java.io.PrintWriter)log);
- }
- catch(com.sun.star.lang.IllegalArgumentException e) {
- System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
- e.printStackTrace((java.io.PrintWriter)log);
- }
- catch(com.sun.star.lang.IllegalAccessException e) {
- System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
- e.printStackTrace((java.io.PrintWriter)log);
- }
- catch(com.sun.star.lang.IndexOutOfBoundsException e) {
- System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
- e.printStackTrace((java.io.PrintWriter)log);
- }
- catch(com.sun.star.lang.WrappedTargetException e) {
- System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
- e.printStackTrace((java.io.PrintWriter)log);
- } */
}
public void reset() {
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 9affbb9499b5..4188ac53bcd3 100755
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -179,7 +179,6 @@ public class _XComponent {
* Forces object recreation.
*/
protected void after() {
-// disposeEnvironment();
}
} // finished class _XComponent
diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index 18d7af99bc52..3bd73a91219f 100755
--- a/framework/qa/complex/imageManager/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -86,7 +86,6 @@ public class _XInitialization {
* Disposes object environment.
*/
public void after() {
-// disposeEnvironment() ;
}
} // finished class _XInitialization
diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java
index ec9d5f3fc634..3e4d5b4b3b5c 100755
--- a/framework/qa/complex/imageManager/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/_XUIConfiguration.java
@@ -77,6 +77,5 @@ public class _XUIConfiguration {
* Dispose because the UIConfigurationManager has to be recreated
*/
public void after() {
-// disposeEnvironment();
}
}
diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index 92d8f3c34543..f882ac73b53e 100755
--- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -38,8 +38,6 @@ import com.sun.star.task.XInteractionRetry;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.AnyConverter;
-//import java.lang.*;
-
/**
* Implemets a simple interaction handler,
@@ -78,7 +76,6 @@ public class InteractionHandler implements XInteractionHandler
public InteractionHandler()
{
m_aRequest = null ;
- //m_aProtocol = aProtocol;
m_nTry = 0 ;
m_bWasUsed = false;
}
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index c28993010ed8..aaf1e8e040dd 100755
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -41,9 +41,6 @@ import com.sun.star.task.XStatusIndicator;
// helper
import com.sun.star.uno.UnoRuntime;
-// others
-//import java.lang.*;
-
// __________ Implementation __________
/**
@@ -79,7 +76,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
private int m_nRange ;
private int m_nValue ;
private int m_nOut ;
-// private Protocol m_aProtocol ;
private boolean m_bWasUsed ;
// ____________________
@@ -94,9 +90,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
m_nRange = 100 ;
m_nValue = 0 ;
m_nOut = nOut ;
- //m_aProtocol = aProtocol ;
m_bWasUsed = false;
-// aProtocol.resetUsingState();
}
// ____________________
@@ -114,10 +108,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
{
synchronized(this)
{
- //m_aProtocol.log("start("+sText+","+nRange+")\n");
m_bWasUsed = true;
-// m_aProtocol.itWasUsed();
-
m_sText = sText ;
m_nRange = nRange;
m_nValue = 0 ;
@@ -134,10 +125,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
{
synchronized(this)
{
- //m_aProtocol.log("end()\n");
m_bWasUsed = true;
-// m_aProtocol.itWasUsed();
-
m_sText = new String();
m_nRange = 100;
m_nValue = 0;
@@ -157,10 +145,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
{
synchronized(this)
{
- //m_aProtocol.log("setText("+sText+")\n");
m_bWasUsed = true;
-// m_aProtocol.itWasUsed();
-
m_sText = sText;
}
impl_show();
@@ -179,9 +164,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
{
synchronized(this)
{
- //m_aProtocol.log("setValue("+nValue+")\n");
m_bWasUsed = true;
-// m_aProtocol.itWasUsed();
if (nValue<=m_nRange)
m_nValue = nValue;
@@ -198,10 +181,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
{
synchronized(this)
{
- //m_aProtocol.log("reset()\n");
m_bWasUsed = true;
-// m_aProtocol.itWasUsed();
-
m_sText = new String();
m_nValue = 0;
}
diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
index 7b59c25d0a79..0afbb9a9279b 100755
--- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
@@ -385,8 +385,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
else
if (m_xOutStream != null)
m_bOutWasUsed = true;
-// else
- //m_aProtocol.log("\tno stream open!\n");
if (m_xSeek == null)
{
@@ -416,8 +414,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
else
if (m_xOutStream != null)
m_bOutWasUsed = true;
-// else
- //m_aProtocol.log("\tno stream open!\n");
if (m_xSeek == null)
{
@@ -449,8 +445,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream ,
else
if (m_xOutStream != null)
m_bOutWasUsed = true;
-// else
- //m_aProtocol.log("\tno stream open!\n");
if (m_xSeek == null)
{
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 36abfd55bbde..e5df2c5a0e03 100755
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -126,7 +126,6 @@ public class PathSettingsTest
try
{
xMSF = getMSF();
-// aPathSettings = xMSF.createInstance("com.sun.star.util.PathSettings");
aPathSettings = xMSF.createInstance("com.sun.star.comp.framework.PathSettings");
assertNotNull("Can't instantiate com.sun.star.util.PathSettings.", aPathSettings);
// System.out.println("Implementation: " + util.utils.getImplName(aPathSettings));
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 36999f0a64e0..ba09a7a15e20 100755
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -197,15 +197,6 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
DocumentAcceleratorConfiguration::reload();
m_aPresetHandler.addStorageListener(this);
}
- /*
-
- Sometimes the configuration seams to be corrupted ..
- So it would be nice if we dont crash the office then .-)
- #121559#
-
- catch(const css::uno::RuntimeException& exRun)
- { throw exRun; }
- */
catch(const css::uno::Exception&)
{}
}
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 5f1f3b7e0d94..dca4a04c01ad 100755
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -102,7 +102,6 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::R
//-----------------------------------------------
ModuleAcceleratorConfiguration::~ModuleAcceleratorConfiguration()
{
- // m_aPresetHandler.removeStorageListener(this);
}
//-----------------------------------------------
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 3a10bad37fa6..ebbd632e2f70 100755
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -153,12 +153,6 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF
// We don't need the write lock any longer ...
// downgrade to read access.
aWriteLock.downgrade();
-/*DEPRECATEME
- // If last frame was removed and special quit mode is enabled by the desktop
- // we must terminate the application by using this asynchronous callback!
- if (m_aContainer.size()<1 && m_bAsyncQuit)
- m_aAsyncCall.Post(0);
-*/
}
aWriteLock.unlock();
@@ -204,12 +198,6 @@ void FrameContainer::clear()
// Its an reference to a valid container-item.
// But no container item => no active frame!
m_xActiveFrame = css::uno::Reference< css::frame::XFrame >();
-/*DEPRECATEME
- // If special quit mode is used - we must terminate the desktop.
- // He is the owner of this container and can't work without any visible tasks/frames!
- if (m_bAsyncQuit)
- m_aAsyncCall.Post(0);
-*/
aWriteLock.unlock();
// } SAFE
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index dae6acc43019..3c3cd7d21bff 100755
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -321,7 +321,6 @@ IMPL_LINK( FwkTabWindow, DeactivatePageHdl, TabControl *, EMPTYARG )
IMPL_LINK( FwkTabWindow, CloseHdl, PushButton *, EMPTYARG )
{
-// Close();
return 0;
}
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 21c7442c8b2e..80519d57987a 100755
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -134,11 +134,10 @@ namespace framework
const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ));
-// #110897#
MenuManager::MenuManager(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren )
-: // #110897#
+:
ThreadHelpBase( &Application::GetSolarMutex() ),
mxServiceFactory(xServiceFactory)
{
@@ -179,8 +178,6 @@ MenuManager::MenuManager(
if (! (( aItemCommand.getLength() > nAddonsURLPrefixLength ) &&
( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 )) )
{
- // #110897#
- // MenuManager* pSubMenuManager = new MenuManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
// Create addon popup menu if there exist elements and this is the tools popup menu
if (( nItemId == SID_ADDONLIST ||
@@ -205,8 +202,6 @@ MenuManager::MenuManager(
aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST );
pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand );
- // #110897#
- // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
// Set image for the addon popup menu item
if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST ))
@@ -226,15 +221,10 @@ MenuManager::MenuManager(
if ( nItemId == SID_NEWDOCDIRECT ||
aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotNewDocDirect)) )
{
- // #110897#
- // Reference< ::com::sun::star::lang::XMultiServiceFactory > aMultiServiceFactory(::comphelper::getProcessServiceFactory());
- // MenuConfiguration aMenuCfg( aMultiServiceFactory );
MenuConfiguration aMenuCfg( getServiceFactory() );
BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_NEWMENU );
pMenu->SetPopupMenu( nItemId, pSubMenu );
- // #110897#
- // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
@@ -246,15 +236,10 @@ MenuManager::MenuManager(
else if ( nItemId == SID_AUTOPILOTMENU ||
aItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(aSlotAutoPilot)) )
{
- // #110897#
- // Reference< ::com::sun::star::lang::XMultiServiceFactory > aMultiServiceFactory(::comphelper::getProcessServiceFactory());
- // MenuConfiguration aMenuCfg( aMultiServiceFactory );
MenuConfiguration aMenuCfg( getServiceFactory() );
BmkMenu* pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( rFrame, BOOKMARK_WIZARDMENU );
pMenu->SetPopupMenu( nItemId, pSubMenu );
- // #110897#
- // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
@@ -405,7 +390,6 @@ throw ( RuntimeException )
URL aTargetURL;
aTargetURL.Complete = pStatusChangedMenu->aMenuItemURL;
- // #110897#
m_xURLTransformer->parseStrict( aTargetURL );
REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
@@ -434,7 +418,6 @@ void MenuManager::ClearMenuDispatch(const EVENTOBJECT& Source,bool _bRemoveOnly)
// disposing called from parent dispatcher
// remove all listener to prepare shutdown
- // #110897#
std::vector< MenuItemHandler* >::iterator p;
for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
{
@@ -492,7 +475,6 @@ void SAL_CALL MenuManager::disposing( const EVENTOBJECT& Source ) throw ( RUNTIM
URL aTargetURL;
aTargetURL.Complete = pMenuItemDisposing->aMenuItemURL;
- // #110897#
m_xURLTransformer->parseStrict( aTargetURL );
pMenuItemDisposing->xMenuItemDispatch->removeStatusListener(SAL_STATIC_CAST( XSTATUSLISTENER*, this ), aTargetURL );
@@ -546,7 +528,6 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
URL aTargetURL;
REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
- // #110897#
REFERENCE< XDISPATCH > xMenuItemDispatch;
static const ::rtl::OUString s_sDefault(RTL_CONSTASCII_USTRINGPARAM("_default"));
@@ -675,7 +656,6 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe
// update window list
::std::vector< ::rtl::OUString > aNewWindowListVector;
- // #110897#
Reference< XDesktop > xDesktop( xServiceFactory->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
sal_uInt16 nActiveItemId = 0;
@@ -836,7 +816,6 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
{
URL aTargetURL;
- // #110897#
ResetableGuard aGuard( m_aLock );
REFERENCE< XDISPATCHPROVIDER > xDispatchProvider( m_xFrame, UNO_QUERY );
@@ -920,9 +899,6 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
{
// window list menu item selected
- // #110897#
- // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance(
- // DESKTOP_SERVICE ), UNO_QUERY );
Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
if ( xDesktop.is() )
@@ -987,10 +963,8 @@ IMPL_LINK( MenuManager, Highlight, Menu *, EMPTYARG )
return 0;
}
-// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& MenuManager::getServiceFactory()
{
- // #110897#
return mxServiceFactory;
}
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 60299919ba9c..ab9664f01bd3 100755
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -452,7 +452,6 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG )
}
catch(const css::lang::DisposedException&)
{
- LOG_ERROR("CloseDispatcher::impl_asyncCallback", "Congratulation! You found the reason for bug #120310#. Please contact the right developer and show him a scenario, which trigger this bug. THX.")
}
return 0;
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index ff8d38d1c505..ce8f9c374a21 100755
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -270,8 +270,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
//*****************************************************************************************************************
// private method
-//
-//
//*****************************************************************************************************************
void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
{
@@ -292,8 +290,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
//*****************************************************************************************************************
// private method
-//
-//
//*****************************************************************************************************************
sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource )
{
@@ -355,14 +351,10 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
// set new menu on our system window and create new menu manager
if ( bMenuFromResource )
{
- // #110897#
- // m_pMenuManager = new MenuManager( xFrame, pMenuBar, sal_True, sal_False );
m_pMenuManager = new MenuManager( m_xFactory, xFrame, pMenuBar, sal_True, sal_False );
}
else
{
- // #110897#
- // m_pMenuManager = new MenuManager( xFrame, pMenuBar, sal_True, sal_True );
m_pMenuManager = new MenuManager( m_xFactory, xFrame, pMenuBar, sal_True, sal_True );
}
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 695fea4b3d81..f1b5edd86691 100755
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -205,17 +205,6 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const css::util::URL& aURL,
xListener->dispatchFinished( aEvent );
}
-/*
- // Try to initialize player.
- m_xListener = xListener;
- if (m_aPlayer.SetSoundName(aURL.Complete))
- {
- // OK- we can start async playing ...
- // Count this request and initialize self-holder against dieing by uno ref count ...
- m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
- m_aPlayer.Play();
- }
-*/
// } SAFE
aLock.unlock();
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 0755bf8baf4e..44518a3458b9 100755
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -393,7 +393,6 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu(
}
Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Menu* pMenu,
const ::rtl::OUString* pMenuIdentifier )
diff --git a/framework/source/fwe/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx
index 7ce56166cf63..fd68b3a0ca0a 100755
--- a/framework/source/fwe/xml/eventsconfiguration.cxx
+++ b/framework/source/fwe/xml/eventsconfiguration.cxx
@@ -64,26 +64,20 @@ namespace framework
{
static Reference< XParser > GetSaxParser(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
)
{
- //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
- //return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
}
static Reference< XDocumentHandler > GetSaxWriter(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
)
{
- //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
- //return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
}
-// #110897#
+
sal_Bool EventsConfiguration::LoadEventsConfig(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rInStream, EventsConfig& aItems )
@@ -124,7 +118,7 @@ sal_Bool EventsConfiguration::LoadEventsConfig(
}
}
-// #110897#
+
sal_Bool EventsConfiguration::StoreEventsConfig(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const EventsConfig& aItems )
diff --git a/framework/source/fwe/xml/imagesconfiguration.cxx b/framework/source/fwe/xml/imagesconfiguration.cxx
index 45f5251373b1..ebf4cff30e4c 100755
--- a/framework/source/fwe/xml/imagesconfiguration.cxx
+++ b/framework/source/fwe/xml/imagesconfiguration.cxx
@@ -68,26 +68,19 @@ SV_IMPL_PTRARR( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr
SV_IMPL_PTRARR( ImageListDescriptor, ImageListItemDescriptorPtr );
static Reference< XParser > GetSaxParser(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
)
{
- //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
- //return Reference< XParser >( xServiceManager->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
return Reference< XParser >( xServiceFactory->createInstance( SERVICENAME_SAXPARSER), UNO_QUERY);
}
static Reference< XDocumentHandler > GetSaxWriter(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
)
{
- //Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
- //return Reference< XDocumentHandler >( xServiceManager->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
}
-// #110897#
sal_Bool ImagesConfiguration::LoadImages(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rInStream, ImageListsDescriptor& aItems )
@@ -128,8 +121,6 @@ sal_Bool ImagesConfiguration::LoadImages(
}
}
-
-// #110897#
sal_Bool ImagesConfiguration::StoreImages(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const ImageListsDescriptor& aItems )
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index f7002dc5dfab..c0feda7ec766 100755
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -103,7 +103,6 @@ throw ( WrappedTargetException )
// create namespace filter and set menudocument handler inside to support xml namespaces
- // #110897# Reference< XDocumentHandler > xDocHandler( new OReadMenuDocumentHandler( xItemContainer ));
Reference< XDocumentHandler > xDocHandler( new OReadMenuDocumentHandler( m_rxServiceManager, xItemContainer ));
Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler ));
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 3f34d742b0e6..bb36e403cc9d 100755
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -253,10 +253,8 @@ OReadMenuDocumentHandler::OReadMenuDocumentHandler(
{
}
-// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory()
{
- // #110897#
return mxServiceFactory;
}
@@ -296,8 +294,6 @@ throw( SAXException, RuntimeException )
{
++m_nElementDepth;
m_bMenuBarMode = sal_True;
-
- // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_xMenuBarContainer, m_xContainerFactory ));
m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_xMenuBarContainer, m_xContainerFactory ));
m_xReader->startDocument();
@@ -336,8 +332,6 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const ::rtl::OUString& aName
// -----------------------------------------------------------------------------
-
-// #110897#
OReadMenuBarHandler::OReadMenuBarHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Reference< XIndexContainer >& rMenuBarContainer,
@@ -350,10 +344,9 @@ OReadMenuBarHandler::OReadMenuBarHandler(
{
}
-// #110897#
+
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory()
{
- // #110897#
return mxServiceFactory;
}
diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx
index 9a50b2a4ec03..165694a962a5 100755
--- a/framework/source/fwe/xml/toolboxconfiguration.cxx
+++ b/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -65,7 +65,6 @@ namespace framework
{
static Reference< XParser > GetSaxParser(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
)
{
@@ -73,14 +72,12 @@ static Reference< XParser > GetSaxParser(
}
static Reference< XDocumentHandler > GetSaxWriter(
- // #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
)
{
return Reference< XDocumentHandler >( xServiceFactory->createInstance( SERVICENAME_SAXWRITER), UNO_QUERY) ;
}
-// #110897#
sal_Bool ToolBoxConfiguration::LoadToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
@@ -120,7 +117,6 @@ sal_Bool ToolBoxConfiguration::LoadToolBox(
}
-// #110897#
sal_Bool ToolBoxConfiguration::StoreToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 4866656bd812..5d1b0631b219 100755
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -77,7 +77,6 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
return m_xLanguageGuesser;
}
-////////////////////////////////////////////////////////////
::rtl::OUString RetrieveLabelFromCommand(
const ::rtl::OUString& aCmdURL,
@@ -153,7 +152,6 @@ uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGues
return aLabel;
}
-////////////////////////////////////////////////////////////
void FillLangItems( std::set< OUString > &rLangItems,
const SvtLanguageTable & rLanguageTable,
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 490ed74e9802..f10851081624 100755
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -130,8 +130,6 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css
css::awt::Size aSize ( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset ,
aRectangle.Height - aInfo.TopInset - aInfo.BottomInset );
- // client size of container window
-// css::uno::Reference< css::awt::XLayoutConstrains > xLayoutContrains( xComponentWindow, css::uno::UNO_QUERY );
css::awt::Size aMinSize( 0, 0 ); // = xLayoutContrains->getMinimumSize();
// Check if request border space would decrease component window size below minimum size
@@ -167,8 +165,6 @@ void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::R
css::awt::DeviceInfo aInfo = xDevice->getInfo();
css::awt::Size aSize ( aRectangle.Width - aInfo.LeftInset - aInfo.RightInset ,
aRectangle.Height - aInfo.TopInset - aInfo.BottomInset );
- // client size of container window
-// css::uno::Reference< css::awt::XLayoutConstrains > xLayoutContrains( xComponentWindow, css::uno::UNO_QUERY );
css::awt::Size aMinSize( 0, 0 );// = xLayoutContrains->getMinimumSize();
// Check if request border space would decrease component window size below minimum size
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 0180d9cee95a..ccb990e0228f 100755
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -443,12 +443,6 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
}
- /*
- #i75167# dont disturb window manager handling .-)
- css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY);
- if (xParentWindowTop.is())
- xParentWindowTop->toFront();
- */
}
//-----------------------------------------------
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index e1770c049621..4e416511c7a3 100755
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -499,8 +499,6 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc
{
ResetableGuard aLock( m_aLock );
- //if ( m_bDisposed )
- // throw DisposedException();
if ( xSettings.is() )
{
@@ -540,8 +538,6 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_
{
ResetableGuard aLock( m_aLock );
- //if ( m_bDisposed )
- // throw DisposedException();
if ( bWriteable )
return Reference< XIndexAccess >( static_cast< OWeakObject * >( new RootItemContainer( m_xConfigData ) ), UNO_QUERY );
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index a09bd83e91f4..635fb4b6aa46 100755
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -756,9 +756,6 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro
/* SAFE { */
ReadGuard aReadLock(m_aLock);
- // don't disagree with this request if job was already stopped or finished it's work
- // if (m_eRunState != E_RUNNING)
- // return;
// Otherwhise try to close() it
css::uno::Reference< css::util::XCloseable > xClose(m_xJob, css::uno::UNO_QUERY);
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index a8dd447f0266..745ce809def6 100755
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1215,7 +1215,6 @@ throw (uno::RuntimeException)
WriteGuard aWriteLock( m_aLock );
m_bInplaceMenuSet = sal_False;
- // if ( m_xMenuBar.is() &&
if ( m_xContainerWindow.is() )
{
SolarMutexGuard aGuard;
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 267c31399fba..e4f73e58c16f 100755
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -149,9 +149,7 @@ class LoadEnvListener : private ThreadHelpBase
throw(css::uno::RuntimeException);
};
-/*-----------------------------------------------
- 14.10.2003 13:43
------------------------------------------------*/
+
LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
throw(LoadEnvException, css::uno::RuntimeException)
: ThreadHelpBase( )
@@ -161,17 +159,13 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& x
{
}
-/*-----------------------------------------------
- 14.10.2003 13:43
------------------------------------------------*/
+
LoadEnv::~LoadEnv()
{
m_pCheck = 0;
}
-/*-----------------------------------------------
- 10.09.2003 14:05
------------------------------------------------*/
+
css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader,
const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ,
const ::rtl::OUString& sURL ,
@@ -241,9 +235,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
return lDescriptor;
}
-/*-----------------------------------------------
- 20.08.2003 09:49
------------------------------------------------*/
+
void LoadEnv::initializeLoading(const ::rtl::OUString& sURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor,
const css::uno::Reference< css::frame::XFrame >& xBaseFrame ,
@@ -326,9 +318,7 @@ void LoadEnv::initializeLoading(const ::rtl::OUString&
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 22.01.2010
------------------------------------------------*/
+
void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMultiServiceFactory >& i_rSMGR,
::comphelper::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode,
QuietInteraction** o_ppQuietInteraction )
@@ -377,9 +367,7 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::lang::XMulti
io_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode;
}
-/*-----------------------------------------------
- 15.08.2003 08:16
------------------------------------------------*/
+
void LoadEnv::startLoading()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -430,7 +418,6 @@ void LoadEnv::startLoading()
}
/*-----------------------------------------------
- 15.08.2003 09:50
TODO
First draft does not implement timeout using [ms].
Current implementation counts yield calls only ...
@@ -471,9 +458,7 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout)
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 20.08.2003 10:00
------------------------------------------------*/
+
void LoadEnv::cancelLoading()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -515,9 +500,7 @@ void LoadEnv::cancelLoading()
// <- PARTIAL(!) SAFE ------------------------------
}
-/*-----------------------------------------------
- 14.08.2003 13:33
------------------------------------------------*/
+
css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const
{
// SAFE ->
@@ -526,9 +509,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::getTarget() const
// <- SAFE
}
-/*-----------------------------------------------
- 14.08.2003 13:35
------------------------------------------------*/
+
css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
{
// SAFE ->
@@ -549,9 +530,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
// <- SAFE
}
-/*-----------------------------------------------
- 15.08.2003 11:15
------------------------------------------------*/
+
void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&)
throw(css::uno::RuntimeException)
{
@@ -566,9 +545,7 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 14.10.2003 12:23
------------------------------------------------*/
+
void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&)
throw(css::uno::RuntimeException)
{
@@ -583,9 +560,7 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 14.10.2003 12:23
------------------------------------------------*/
+
void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
throw(css::uno::RuntimeException)
{
@@ -615,9 +590,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 14.10.2003 12:24
------------------------------------------------*/
+
void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
throw(css::uno::RuntimeException)
{
@@ -632,9 +605,7 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 14.10.2003 12:20
------------------------------------------------*/
+
void LoadEnv::impl_setResult(sal_Bool bResult)
{
// SAFE -> ----------------------------------
@@ -654,7 +625,6 @@ void LoadEnv::impl_setResult(sal_Bool bResult)
}
/*-----------------------------------------------
- 06.02.2004 14:03
TODO: Is it a good idea to change Sequence<>
parameter to stl-adapter?
-----------------------------------------------*/
@@ -743,17 +713,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
css::uno::Reference< css::container::XEnumeration > xSet ;
css::uno::Sequence< ::rtl::OUString > lTypesReg(1);
- /*
- //-------------------------------------------
- lQuery[0].Name = ::framework::constant::Filter::PROP_TYPE;
- lQuery[0].Value <<= sType;
-
- xContainer = css::uno::Reference< css::container::XContainerQuery >(xSMGR->createInstance(SERVICENAME_FILTERFACTORY), css::uno::UNO_QUERY);
- xSet = xContainer->createSubSetEnumerationByProperties(lQuery);
- // at least one registered frame loader is enough!
- if (xSet->hasMoreElements())
- return E_CAN_BE_LOADED;
- */
//-------------------------------------------
// (iii) If a FrameLoader service (or at least
@@ -811,9 +770,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString&
return E_UNSUPPORTED_CONTENT;
}
-/*-----------------------------------------------
- 03.11.2003 09:31
------------------------------------------------*/
+
void LoadEnv::impl_detectTypeAndFilter()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -918,9 +875,7 @@ void LoadEnv::impl_detectTypeAndFilter()
}
}
-/*-----------------------------------------------
- 15.08.2003 09:38
------------------------------------------------*/
+
sal_Bool LoadEnv::impl_handleContent()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1209,9 +1164,7 @@ sal_Bool LoadEnv::impl_loadContent()
return sal_False;
}
-/*-----------------------------------------------
- 06.02.2004 14:40
------------------------------------------------*/
+
css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
{
// SAFE -> -----------------------------------
@@ -1277,9 +1230,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
return css::uno::Reference< css::uno::XInterface >();
}
-/*-----------------------------------------------
- 24.01.2006 15:11
------------------------------------------------*/
+
void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& xFrame,
const css::util::URL& aURL )
{
@@ -1311,9 +1262,7 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList());
}
-/*-----------------------------------------------
- 31.07.2003 09:02
------------------------------------------------*/
+
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1459,9 +1408,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
return xResult;
}
-/*-----------------------------------------------
- 30.03.2004 09:12
------------------------------------------------*/
+
sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const
{
css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY);
@@ -1476,9 +1423,7 @@ sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< c
return xLock->isActionLocked();
}
-/*-----------------------------------------------
- 30.03.2004 09:12
------------------------------------------------*/
+
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1610,9 +1555,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
return xTask;
}
-/*-----------------------------------------------
- 15.08.2003 12:39
------------------------------------------------*/
+
void LoadEnv::impl_reactForLoadingState()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1731,9 +1674,7 @@ void LoadEnv::impl_reactForLoadingState()
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 16.01.2005 13:04
------------------------------------------------*/
+
void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow ,
sal_Bool bForceToFront)
{
@@ -1761,38 +1702,9 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
else
pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
}
-
-/* #i19976#
- We tried to prevent a toFront() call in case the user putted the
- loading document into the background ..
- But we had several errors trying that. So we decided to
- rollback these changes and bring the new loaded document to front hardly !
-
- css::uno::Reference< css::awt::XWindow2 > xWindow2(xWindow, css::uno::UNO_QUERY);
-
- sal_Bool bIsVisible = sal_False;
- if (xWindow2.is())
- bIsVisible = xWindow2->isVisible(); // TODO is parent visible too ? .-)
-
- if (!bIsVisible)
- {
- xWindow->setVisible(sal_True);
- bForceToFront = sal_True;
- }
-
- if (
- (bForceToFront ) &&
- (xTopWindow.is())
- )
- {
- xTopWindow->toFront();
- }
-*/
}
-/*-----------------------------------------------
- 15.03.2005 11:12
------------------------------------------------*/
+
void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
{
static ::rtl::OUString PACKAGE_SETUP_MODULES(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Office/Factories"));
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 0514725f353c..67ac4381418b 100755
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -604,7 +604,6 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
try
{
- // if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
// Auto save is called from our internal timer ... not via dispatch() API !
// else
if (
@@ -1612,7 +1611,6 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG)
}
catch(const css::uno::Exception&)
{
- LOG_ASSERT(sal_False, "May be you found the reason for bug #125528#. Please report a test scenario to the right developer. THX.");
}
return 0;
@@ -3227,9 +3225,7 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const ::rtl::OUSt
{ return AutoRecovery::E_WRONG_TARGET_PATH; }
sal_Int32 nNameClash;
-// nNameClash = css::ucb::NameClash::ERROR;
nNameClash = css::ucb::NameClash::RENAME;
-// nNameClash = css::ucb::NameClash::OVERWRITE;
try
{
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 199db043d46b..05eb6852c1ba 100755
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -513,12 +513,6 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
{
xLayoutManager->lock();
xLayoutManager->createElement( DECLARE_ASCII( "private:resource/menubar/menubar" ));
- /* #i85963# new backing window comes withoud standard bar and statusbar
- xLayoutManager->createElement( DECLARE_ASCII( "private:resource/toolbar/standardbar" ));
- xLayoutManager->createElement( DECLARE_ASCII( "private:resource/statusbar/statusbar" ));
- xLayoutManager->showElement ( DECLARE_ASCII( "private:resource/toolbar/standardbar" ));
- xLayoutManager->showElement ( DECLARE_ASCII( "private:resource/statusbar/statusbar" ));
- */
xLayoutManager->unlock();
}
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 369394d008c7..60ebf97da0e8 100755
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -686,13 +686,6 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
{
LOG_WARNING("Desktop::getTasks()", "Use of obsolete interface XTaskSupplier")
return NULL;
- /*
- TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
-
- OTasksAccess* pTasksAccess = new OTasksAccess( this, &m_aChildTaskContainer );
- css::uno::Reference< css::container::XEnumerationAccess > xAccess( static_cast< ::cppu::OWeakObject* >(pTasksAccess), css::uno::UNO_QUERY );
- return xAccess;
- */
}
/*-************************************************************************************************************//**
@@ -715,11 +708,6 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException )
{
- /*
- TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
-
- return css::uno::Reference< css::frame::XTask >( m_aChildTaskContainer.getActive(), css::uno::UNO_QUERY );
- */
LOG_WARNING("Desktop::getActiveTask()", "Use of obsolete interface XTaskSupplier")
return NULL;
}
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 629ebe735035..4bd3260defcb 100755
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -168,7 +168,6 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
// dispatch it and wait for a notification
// TODO/MBA: waiting in main thread?!
xNotifyDispatch->dispatchWithNotification(aURL, aArguments, xListener);
- //m_aBlock.wait();
aResult = m_aResult;
}
else
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 9534685b2363..e4d5655ca5f0 100755
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -959,7 +959,6 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
// Search on all our direct siblings - means all childrens of our parent.
// Use this flag in combination with TASK. We must supress such upper search if
// user has not set it and if we are a top frame.
- //
// Attention: Don't forward this request to our parent as a findFrame() call.
// In such case we must protect us against recursive calls.
// Use snapshot of our parent. But don't use queryFrames() of XFrames interface.
@@ -1546,9 +1545,6 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th
css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() throw( css::uno::RuntimeException )
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
- // It seems to be unavoidable that disposed frames allow to ask for a Controller (#111452)
- // Register transaction and reject wrong calls.
- // TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
ReadGuard aReadLock( m_aLock );
@@ -2272,7 +2268,6 @@ aEvent
// Activate the new active path from here to top.
if( eState == E_INACTIVE )
{
-// CheckMenuCloser_Impl();
setActiveFrame( css::uno::Reference< css::frame::XFrame >() );
activate();
}
@@ -2307,7 +2302,6 @@ aEvent
// Only if no activation is done, deactivations have to be processed if the activated window
// is a parent window of the last active Window!
SolarMutexClearableGuard aSolarGuard;
-// CheckMenuCloser_Impl();
Window* pFocusWindow = Application::GetFocusWindow();
if (
( xContainerWindow.is() == sal_True ) &&
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 629eb5047893..cdcb26e67f2d 100755
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -258,10 +258,6 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
Bootstrap::locateBaseInstallation(aBaseInstallPath);
if (aBaseLocateResult != Bootstrap::PATH_EXISTS)
{
- // base install noit found
- // prepare termination
- // m_bTerminate = sal_True;
- // Application::PostUserEvent( STATIC_LINK( 0, License, Terminate ) );
aRet <<= sal_False;
return aRet;
}
@@ -321,10 +317,6 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
{
// get LicenseFileDate from base install
::rtl::OUString aLicenseURL = aLicensePath;
- /*
- if (FileBase::getFileURLFromSystemPath(aLicensePath, aLicenseURL) != FileBase::E_None)
- return makeAny(sal_False);
- */
DirectoryItem aDirItem;
if (DirectoryItem::get(aLicenseURL, aDirItem) != FileBase::E_None)
return makeAny(sal_False);
@@ -374,10 +366,6 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
}
else
{
- // license was not accepted
- // prepare termination
- // m_bTerminate = sal_True;
- // Application::PostUserEvent( STATIC_LINK( 0, License, Terminate ) );
aRet <<= sal_False;
}
}
@@ -460,7 +448,6 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
sal_uInt64 nPosition = 0;
sal_uInt32 nBytes = (sal_uInt32)fs.getFileSize();
sal_Char *pBuffer = new sal_Char[nBytes];
- // FileBase RC r = FileBase::E_None;
while (aLicenseFile.read(pBuffer+nPosition, nBytes-nPosition, nBytesRead) == FileBase::E_None
&& nPosition + nBytesRead < nBytes)
{
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index 390f49ef6631..8e62ee50f1b4 100755
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -86,7 +86,6 @@ DEFINE_INIT_SERVICE ( MediaTypeDetectionHelper,
// XStringMapping
//*****************************************************************************************************************
-//virtual
sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(
uno::Sequence< OUString >& rSeq )
throw(uno::RuntimeException)
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 13079a4b7ae5..88163253fc2c 100755
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -175,10 +175,6 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
throw (css::uno::RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::changesOccurred" );
- /*
- if (m_bIgnoreEvents)
- return;
- */
sal_Int32 c = aEvent.Changes.getLength();
sal_Int32 i = 0;
@@ -310,7 +306,6 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s
{
css::beans::Property aInfo = xInfo->getAsProperty();
sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY );
- //sal_Bool bMandatory = ((aInfo.Attributes & css::beans::PropertyAttribute::REMOVEABLE) != css::beans::PropertyAttribute::REMOVEABLE);
// Note: Till we support finalized / mandatory on our API more in detail we handle
// all states simple as READONLY ! But because all realy needed pathes are "mandatory" by default
@@ -948,17 +943,6 @@ void PathSettings::impl_setPathValue( sal_Int32 nID ,
// TODO check if path has at least one path value set
// At least it depends from the feature using this path, if an empty path list is allowed.
- /*
- if (impl_isPathEmpty(aChangePath))
- {
- ::rtl::OUStringBuffer sMsg(256);
- sMsg.appendAscii("The path '" );
- sMsg.append (aChangePath.sPathName);
- sMsg.appendAscii("' is empty now ... Not a real good idea.");
- throw css::uno::Exception(sMsg.makeStringAndClear(),
- static_cast< ::cppu::OWeakObject* >(this));
- }
- */
// first we should try to store the changed (copied!) path ...
// In case an error occure on saving time an exception is thrown ...
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index 47c6a8494065..1adfea3af683 100755
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -250,7 +250,6 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event)
{
if (event.FeatureDescriptor.compareToAscii("update")==0)
m_bRestored = sal_True; // a document was restored
- // if (event.FeatureDescriptor.compareToAscii("stop")==0)
}
else if (event.FeatureURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.autorecovery:/doSessionSave")))
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 757818aa4c17..bded3d54af72 100755
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -70,7 +70,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
#define STRPOS_NOTFOUND (sal_Int32)-1
@@ -137,7 +136,6 @@ using namespace com::sun::star::container;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
@@ -223,7 +221,6 @@ static FixedVariable aFixedVarTable[] =
//_________________________________________________________________________________________________________________
// Implementation helper classes
//_________________________________________________________________________________________________________________
-//
OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const rtl::OUString& aOSString )
{
@@ -320,7 +317,6 @@ void SubstitutePathVariables_Impl::Commit()
//_________________________________________________________________________________________________________________
// private methods
//_________________________________________________________________________________________________________________
-//
OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
{
@@ -684,7 +680,6 @@ throw ( NoSuchElementException, RuntimeException )
//_________________________________________________________________________________________________________________
// protected methods
//_________________________________________________________________________________________________________________
-//
IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNotify*, EMPTYARG )
{
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 219816093a67..bacbd8e74ee3 100755
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -175,8 +175,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
xContainerWindow = implts_createContainerWindow(xParentWindow, aPosSize, bCreateTopWindow);
}
- //------------------->
- // HACK #125187# + #i53630#
+ // #i53630#
// Mark all document windows as "special ones", so VCL can bind
// special features to it. Because VCL doesnt know anything about documents ...
// Note: Doing so it's no longer supported, that e.g. our wizards can use findFrame(_blank)
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 5639516c2044..143faff001d6 100755
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -58,7 +58,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using ::rtl::OUString;
using namespace com::sun::star;
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 8be283d220b5..2c4710209f7c 100755
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -54,7 +54,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using ::rtl::OUString;
using namespace com::sun::star::uno;
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index a7974f6ed082..f246cb9365a0 100755
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -58,7 +58,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace ::com::sun::star;
@@ -67,7 +66,6 @@ using ::rtl::OUString;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
static const char GLOBALSETTINGS_ROOT_ACCESS[] = "/org.openoffice.Office.UI.GlobalSettings/Toolbars";
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 88c377e7a35e..61086f56db68 100755
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -297,7 +297,6 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
}
}
- //rElementTypeData.bLoaded = true;
}
void ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData )
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index 49d415b7655f..1a04cf285ab1 100755
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -65,7 +65,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -76,7 +75,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
struct ModuleToCategory
{
diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 2b24b3931e0e..46f919d37678 100755
--- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -1357,7 +1357,6 @@ Reference< XInterface > UIConfigurationManagerImpl::getImageManager() throw (::c
return Reference< XInterface >( m_xModuleImageManager, UNO_QUERY );
-// return Reference< XInterface >();
}
Reference< XInterface > UIConfigurationManagerImpl::getShortCutManager() throw (::com::sun::star::uno::RuntimeException)
@@ -1454,14 +1453,12 @@ void UIConfigurationManagerImpl::setStorage( const Reference< XStorage >& Storag
else if ( i == ::com::sun::star::ui::UIElementType::STATUSBAR )
aResourceType = PresetHandler::RESOURCETYPE_STATUSBAR();
- //if ( aResourceType.getLength() > 0 )
- {
- m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
- m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
- rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... seee next lines!
- sEmpty,
- m_xUserConfigStorage);
- }
+
+ m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
+ m_pStorageHandler[i]->connectToResource( PresetHandler::E_DOCUMENT,
+ rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be used later ... see next lines!
+ sEmpty,
+ m_xUserConfigStorage);
}
Reference< XPropertySet > xPropSet( m_xUserConfigStorage, UNO_QUERY );
if ( xPropSet.is() )
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index ad03a45dfcb9..4366700eb890 100755
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -61,7 +61,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -74,7 +73,6 @@ using namespace ::com::sun::star::ui;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
static const char CONFIGURATION_ROOT_ACCESS[] = "/org.openoffice.Office.UI.";
static const char CONFIGURATION_WINDOWSTATE_ACCESS[] = "/UIElements/States";
@@ -589,12 +587,10 @@ void SAL_CALL ConfigurationAccess_WindowState::elementInserted( const ContainerE
void SAL_CALL ConfigurationAccess_WindowState::elementRemoved ( const ContainerEvent& ) throw(RuntimeException)
{
- //
}
void SAL_CALL ConfigurationAccess_WindowState::elementReplaced( const ContainerEvent& ) throw(RuntimeException)
{
- //
}
// lang.XEventListener
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 4804c60bcf67..e0ec7dd7d703 100755
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -193,7 +193,6 @@ const char* aCommands[] =
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index c09950565e0a..8360f60381de 100755
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -61,7 +61,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index e27aab595185..d8b0b14eeb89 100755
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -62,7 +62,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 6526296ace62..98deb29cbc11 100755
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -64,7 +64,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 24329418595a..2ab480d17247 100755
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -65,7 +65,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 30c8b1e098f1..d81aec95030e 100755
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -80,7 +80,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace ::com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -262,11 +261,9 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
- //
// now add menu entries
// the different menues purpose will be handled by the different string
// for aCmd_Dialog and aCmd_Language
- //
sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command
const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); // multiple languages in current selection
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index bceaf3417500..88096ca36ed8 100755
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -87,7 +87,6 @@ using ::rtl::OUString;
namespace framework
{
-////////////////////////////////////////////////////////////
DEFINE_XSERVICEINFO_MULTISERVICE ( LangSelectionStatusbarController ,
OWeakObject ,
@@ -202,9 +201,7 @@ throw (::com::sun::star::uno::RuntimeException)
FillLangItems( aLangItems, aLanguageTable, m_xFrame, m_aLangGuessHelper,
m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
- //
// add first few entries to main menu
- //
sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1);
const OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); // multiple languages in current selection
const OUString sEmpty; // 'no language found' from language guessing
@@ -233,9 +230,7 @@ throw (::com::sun::star::uno::RuntimeException)
xPopupMenu->insertItem( MID_LANG_SEL_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_RESET );
xPopupMenu->insertItem( MID_LANG_SEL_MORE, String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_SEL_MORE );
- //
// add entries to submenu ('set language for paragraph')
- //
nItemId = static_cast< sal_Int16 >(MID_LANG_PARA_1);
for (it = aLangItems.begin(); it != aLangItems.end(); ++it)
{
@@ -255,17 +250,13 @@ throw (::com::sun::star::uno::RuntimeException)
subPopupMenu->insertItem( MID_LANG_PARA_RESET, String( FwkResId( STR_RESET_TO_DEFAULT_LANGUAGE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_RESET );
subPopupMenu->insertItem( MID_LANG_PARA_MORE, String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_MORE );
- //
// add last two entries to main menu
- //
xPopupMenu->insertSeparator( MID_LANG_PARA_SEPERATOR );
xPopupMenu->insertItem( MID_LANG_PARA_STRING, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), css::awt::MenuItemStyle::RADIOCHECK, MID_LANG_PARA_STRING );
xPopupMenu->setPopupMenu( MID_LANG_PARA_STRING, subPopupMenu );
- //
// now display the popup menu and execute every command ...
- //
Reference< awt::XWindowPeer > xParent( m_xParentWindow, UNO_QUERY );
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index bd05a9ae7ddd..b51070830d12 100755
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -149,15 +149,10 @@ void MacrosMenuController::impl_select(const Reference< XDispatch >& /*_xDispatc
ExecuteInfo* pExecuteInfo = new ExecuteInfo;
pExecuteInfo->xDispatch = xDispatch;
pExecuteInfo->aTargetURL = aTargetURL;
- //pExecuteInfo->aArgs = aArgs;
if(::comphelper::UiEventsLogger::isEnabled()) //#i88653#
UiEventLogHelper(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MacrosMenuController"))).log(m_xServiceManager, m_xFrame, aTargetURL, pExecuteInfo->aArgs);
-// xDispatch->dispatch( aTargetURL, aArgs );
Application::PostUserEvent( STATIC_LINK(0, MacrosMenuController , ExecuteHdl_Impl), pExecuteInfo );
}
- else
- {
- }
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index f2d90c4e0696..4c9a190e3221 100755
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -191,7 +191,6 @@ static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
return n;
}
-// #110897#
MenuBarManager::MenuBarManager(
const Reference< XMultiServiceFactory >& xServiceFactory,
const Reference< XFrame >& rFrame,
@@ -216,7 +215,6 @@ MenuBarManager::MenuBarManager(
FillMenuManager( pMenu, rFrame, rDispatchProvider, rModuleIdentifier, bDelete, bDeleteChildren );
}
-// #110897#
MenuBarManager::MenuBarManager(
const Reference< XMultiServiceFactory >& xServiceFactory,
const Reference< XFrame >& rFrame,
@@ -239,7 +237,6 @@ MenuBarManager::MenuBarManager(
Init(rFrame,pAddonMenu,bDelete,bDeleteChildren);
}
-// #110897#
MenuBarManager::MenuBarManager(
const Reference< XMultiServiceFactory >& xServiceFactory,
const Reference< XFrame >& rFrame,
@@ -381,7 +378,6 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
{
ResetableGuard aGuard( m_aLock );
-// RemoveListener();
Destroy();
m_bDisposed = sal_True;
@@ -521,7 +517,7 @@ throw ( RuntimeException )
status::Visibility aVisibilityStatus;
#ifdef UNIX
- // #b6673979# enable some slots hardly, because UNIX clipboard does not notify all changes
+ //enable some slots hardly, because UNIX clipboard does not notify all changes
// Can be removed if follow up task will be fixed directly within applications.
if (
( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Paste"))) ||
@@ -614,8 +610,6 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16
void MenuBarManager::RequestImages()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::RequestImages" );
- // must be locked from callee
- // ResetableGuard aGuard( m_aLock );
m_bRetrieveImages = sal_True;
const sal_uInt32 nCount = m_aMenuItemHandlerVector.size();
@@ -1083,8 +1077,6 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
{
// window list menu item selected
- // #110897#
- // Reference< XFramesSupplier > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( DESKTOP_SERVICE ), UNO_QUERY );
Reference< XFramesSupplier > xDesktop( getServiceFactory()->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
if ( xDesktop.is() )
@@ -1359,7 +1351,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
( aItemCommand.indexOf( ADDONSPOPUPMENU_URL_PREFIX ) == 0 ))
{
// A special addon popup menu, must be created with a different ctor
- // #110897#
MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), m_xFrame, m_xURLTransformer,(AddonPopupMenu *)pPopup, bDeleteChildren, bDeleteChildren );
AddMenu(pSubMenuManager,aItemCommand,nItemId);
}
@@ -1406,8 +1397,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
if ( nItemId == ITEMID_ADDONLIST )
{
- // Create control structure within the "Tools" sub menu for the Add-Ons popup menu
- // #110897# MenuBarManager* pSubMenuManager = new MenuBarManager( rFrame, pSubMenu, sal_True, sal_False );
AddonMenu* pSubMenu = dynamic_cast< AddonMenu* >( pPopup );
if ( pSubMenu )
{
@@ -1427,7 +1416,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
}
else
{
- // #110897# MenuBarManager* pSubMenuManager = new MenuBarManager( rFrame, pPopupMenu, bDeleteChildren, bDeleteChildren );
MenuBarManager* pSubMenuMgr = new MenuBarManager( getServiceFactory(), rFrame, m_xURLTransformer,rDispatchProvider, aModuleIdentifier, pPopup, bDeleteChildren, bDeleteChildren );
AddMenu(pSubMenuMgr,aItemCommand,nItemId);
}
@@ -1996,10 +1984,8 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
}
}
-// #110897#
const Reference< XMultiServiceFactory >& MenuBarManager::getServiceFactory()
{
- // #110897#
return mxServiceFactory;
}
@@ -2063,7 +2049,6 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen
PopupMenu* pPopupMenu = pAddonMenu->GetPopupMenu( nItemId );
if ( pPopupMenu )
{
- // #110897#
Reference< XDispatchProvider > xDispatchProvider;
MenuBarManager* pSubMenuManager = new MenuBarManager( getServiceFactory(), rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, _bHandlePopUp ? sal_False : bDeleteChildren, _bHandlePopUp ? sal_False : bDeleteChildren );
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index d1aff13ee32d..cde049579711 100755
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -102,7 +102,6 @@ DEFINE_XTYPEPROVIDER_11 ( MenuBarWrapper ,
::com::sun::star::container::XNameAccess
)
-// #110897#
MenuBarWrapper::MenuBarWrapper(
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager
)
@@ -209,7 +208,6 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th
// support. This feature is currently used for "Inplace editing"!
Reference< XDispatchProvider > xDispatchProvider;
- // #110897#
MenuBarManager* pMenuBarManager = new MenuBarManager( m_xServiceFactory,
xFrame,
xTrans,
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 184afc3bd9ed..ea8eaa3afd44 100755
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -71,7 +71,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -571,16 +570,6 @@ IMPL_STATIC_LINK_NOINSTANCE( NewMenuController, ExecuteHdl_Impl, NewDocument*, p
// Framework can recycle our current frame and the layout manager disposes all user interface
// elements if a component gets detached from its frame!
pNewDocument->xDispatch->dispatch( pNewDocument->aTargetURL, pNewDocument->aArgSeq );
-/*
- }
- catch (const ::com::sun::star::document::CorruptedFilterConfigurationException& exFilters)
- {
- throw exFilters;
- }
- catch (const Exception& )
- {
- }
-*/
delete pNewDocument;
return 0;
}
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 841c84e661cd..1728fe17dc06 100755
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -61,7 +61,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 6bb5bfdbaf87..ae976e75fe35 100755
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -70,7 +70,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 7cddd4b566f9..f6f59c4e51d6 100755
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -350,7 +350,6 @@ void ToolBarManager::Destroy()
m_pToolBar->SetStateChangedHdl( aEmpty );
m_pToolBar->SetDataChangedHdl( aEmpty );
-// delete m_pToolBar;
m_pToolBar = 0;
}
@@ -527,22 +526,6 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com::
{
}
- /* m_bUpdateControllers = sal_True;
- ToolBarControllerMap::iterator pIter = m_aControllerMap.begin();
-
- while ( pIter != m_aControllerMap.end() )
- {
- try
- {
- Reference< XUpdatable > xUpdatable( pIter->second, UNO_QUERY );
- if ( xUpdatable.is() )
- xUpdatable->update();
- }
- catch ( Exception& )
- {
- }
- ++pIter;
- }*/
}
m_bUpdateControllers = sal_False;
@@ -1105,7 +1088,6 @@ void ToolBarManager::CreateControllers()
//for Support Visiblitly by shizhoubo
if (pController)
{
- // rtl::OUString aCommandURL = pController->m_aCommandURL;
if(aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SwitchXFormsDesignMode" )) ||
aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ViewDataSourceBrowser" )) ||
aCommandURL == rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ParaLeftToRight" )) ||
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 46a8258828cf..ed5eee6a3e7e 100755
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -79,7 +79,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index d20d53c995cb..273d46faf2d8 100755
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -64,7 +64,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -75,7 +74,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
struct ModuleToCommands
{
@@ -238,7 +236,6 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUStrin
m_aConfigPopupAccess += aModuleName;
m_aConfigPopupAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_POP_ELEMENT_ACCESS ));
- //m_xConfigProviderPopups = Reference< XMultiServiceFactory >( rServiceManager->createInstance(SERVICENAME_CFGPROVIDER),UNO_QUERY );
rtl::OUString aTmp;
::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ) >>= aTmp;
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx
index f72372fafe2b..5340cc6bd65b 100755
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolboxfactory.cxx
@@ -57,7 +57,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index f85994447ae0..b324d071ed20 100755
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -57,7 +57,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -68,7 +67,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index db1306010327..2fef7db68f44 100755
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -61,7 +61,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uifactory/popupmenucontrollerfactory.cxx b/framework/source/uifactory/popupmenucontrollerfactory.cxx
index 87ed770c43f1..fa8641bcaef0 100755
--- a/framework/source/uifactory/popupmenucontrollerfactory.cxx
+++ b/framework/source/uifactory/popupmenucontrollerfactory.cxx
@@ -56,7 +56,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -67,7 +66,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
diff --git a/framework/source/uifactory/statusbarcontrollerfactory.cxx b/framework/source/uifactory/statusbarcontrollerfactory.cxx
index 793235ef8923..b1f1d7463b0e 100755
--- a/framework/source/uifactory/statusbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/statusbarcontrollerfactory.cxx
@@ -55,7 +55,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -66,7 +65,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index acf9565a3067..dc523dc3dfd5 100755
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -58,7 +58,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx
index 0bf9320371d7..7bea7c329172 100755
--- a/framework/source/uifactory/toolbarcontrollerfactory.cxx
+++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx
@@ -55,7 +55,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -66,7 +65,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolboxfactory.cxx
index 0e823c9261cc..f8af5372018b 100755
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolboxfactory.cxx
@@ -57,7 +57,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index b1c419882824..34ed345bb257 100755
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -61,7 +61,6 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -74,7 +73,6 @@ using namespace ::com::sun::star::frame;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx
index cd76f81b3f9a..df02b00e3bd7 100755
--- a/framework/source/uifactory/windowcontentfactorymanager.cxx
+++ b/framework/source/uifactory/windowcontentfactorymanager.cxx
@@ -61,14 +61,12 @@
//_________________________________________________________________________________________________________________
// Defines
//_________________________________________________________________________________________________________________
-//
using namespace ::com::sun::star;
//_________________________________________________________________________________________________________________
// Namespace
//_________________________________________________________________________________________________________________
-//
namespace framework
{
@@ -136,31 +134,6 @@ uno::Reference< uno::XInterface > SAL_CALL WindowContentFactoryManager::createIn
const uno::Reference< uno::XComponentContext >& /*xContext*/ )
throw (uno::Exception, uno::RuntimeException)
{
-/*
- // Currently this method cannot be implemented for generic use. There is no way for external
- code to get a handle to the dialog model.
-
- uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY );
-
- const ::rtl::OUString sToolkitService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit"));
- uno::Reference< awt::XToolkit > xToolkit( xServiceManager->createInstance( sToolkitService ), uno::UNO_QUERY_THROW );
-
- const ::rtl::OUString sDialogModelService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialogModel"));
- uno::Reference< awt::XControlModel > xDialogModel( xServiceManager->createInstance( sDialogModelService ), uno::UNO_QUERY_THROW );
-
- const ::rtl::OUString sDecoration(RTL_CONSTASCII_USTRINGPARAM("Decoration"));
- uno::Reference< beans::XPropertySet > xPropSet( xDialogModel, uno::UNO_QUERY_THROW );
- xPropSet->setPropertyValue( sDecoration, uno::makeAny(false));
-
- const ::rtl::OUString sDialogService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlDialog"));
- uno::Reference< awt::XControl > xDialogControl( xServiceManager->createInstance( sDialogService ), uno::UNO_QUERY_THROW );
-
- xDialogControl->setModel( xDialogModel );
-
- uno::Reference< awt::XWindowPeer > xWindowParentPeer( xToolkit->getDesktopWindow(), uno::UNO_QUERY );
- xDialogControl->createPeer( xToolkit, xWindowParentPeer );
- uno::Reference< uno::XInterface > xWindow( xDialogControl->getPeer(), uno::UNO_QUERY );
-*/
uno::Reference< uno::XInterface > xWindow;
return xWindow;
}
diff --git a/framework/test/test.cxx b/framework/test/test.cxx
index 0fa0813ee13a..08ace331836a 100755
--- a/framework/test/test.cxx
+++ b/framework/test/test.cxx
@@ -180,7 +180,6 @@ TestApplication aTestApplication ;
void TestApplication::Main()
{
-// RegistryCache aCache;
/**-***********************************************************************************************************
initialize program
@@ -239,10 +238,7 @@ void TestApplication::Main()
bState = impl_testTreeSearch();
#endif
-// Execute();
-// xFrame->dispose();
-// delete pMainWindow;
- if( bState = sal_True )
+ if( bState == sal_True )
{
LOG_ERROR( "TestApplication::Main()", "Test successful ..." )
}
@@ -402,8 +398,6 @@ void TestApplication::impl_testLoginDialog()
LOG_ASSERT( !(xDialog.is()==sal_False), "TestApplication::impl_testLoginDialog()\nCould not create login dialog.\n" )
// Check set/getTitle()
/* not implemented yet! */
-// OUString sTitle = DECLARE_ASCII("Login Dialog Test");
-// xDialog->setTitle( sTitle );
// LOG_ASSERT( !(xDialog->getTitle()!=sTitle), "TestApplication::impl_testLoginDialog()\nset/getTitle don't work correct.\n" )
UniString sInternalURL = DECLARE_ASCII("private:factory/scalc");
@@ -868,45 +862,14 @@ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop )
xFrames->append( xFrame_4112 );
xFrames->append( xFrame_4113 );
- // Create some active paths.
- // desktop => task_1 => frame_11 => frame_112 => frame_1122
-// xDesktopSupplier->setActiveFrame( xTaskFrame_1 );
-// xTaskFramesSupplier_1->setActiveFrame( xFrame_11 );
-// xFramesSupplier_11->setActiveFrame( xFrame_112 );
-// xFramesSupplier_112->setActiveFrame( xFrame_1122 );
- // frame_41 => frame_411 => frame_4111
-// xFramesSupplier_41->setActiveFrame( xFrame_411 );
-// xFramesSupplier_411->setActiveFrame( xFrame_4111 );
- // task_3 => frame_31
-// xTaskFramesSupplier_3->setActiveFrame( xFrame_31 );
- // frame_1123 => frame_11231
-// xFramesSupplier_1123->setActiveFrame( xFrame_11231 );
-
-// xTask_1->activate();
-// impl_logTree( xDesktop );
-// xFrame_41->activate();
-// impl_logTree( xDesktop );
-// xFrame_52->activate();
-// impl_logTree( xDesktop );
+
// WRITE_LOGFILE( LOGFILENAME_TREE, "initiale Hierarchy:" )
impl_logTree( xDesktop );
-// xFrame_121->activate();
-// impl_logTree( xDesktop );
-// xFrame_41->activate();
-// impl_logTree( xDesktop );
-// xFrame_52->activate();
-// impl_logTree( xDesktop );
// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_411->activate():" )
xFrame_411->activate();
// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_411->activate():" )
impl_logTree( xDesktop );
-// xFrame_41->deactivate();
-// impl_logTree( xDesktop );
-// xFrame_4113->activate();
-// impl_logTree( xDesktop );
-// xFrame_21->activate();
-// impl_logTree( xDesktop );
// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_11231->activate():" )
xFrame_11231->activate();
// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11231->activate():" )
@@ -917,8 +880,6 @@ void TestApplication::impl_buildTree( const Reference< XDesktop >& xDesktop )
// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_11221->activate():" )
impl_logTree( xDesktop );
-// WRITE_LOGFILE( LOGFILENAME_EVENTS, "nach xFrame_112->deactivate():" )
-// xFrame_112->getCreator()->setActiveFrame( Reference< XFrame >() );
xFrame_112->deactivate();
// WRITE_LOGFILE( LOGFILENAME_TREE, "nach xFrame_112->deactivate():" )
impl_logTree( xDesktop );
@@ -953,9 +914,6 @@ void TestApplication::impl_logTree( const Reference< XDesktop >& xDesktop )
OUString sTreeNamesStream = xDebug->dumpVariable( DUMPVARIABLE_TREEINFO, 0 );
// And write it to logfile.
OString sOutPut = OUStringToOString( sTreeNamesStream, RTL_TEXTENCODING_UTF8 );
-// WRITE_LOGFILE( LOGFILENAME_TREE, "\nNew tree log:\n\n" );
-// WRITE_LOGFILE( LOGFILENAME_TREE, sOutPut );
-// WRITE_LOGFILE( LOGFILENAME_TREE, "\n" );
#endif
}
#endif // TEST_DESKTOP
diff --git a/framework/test/test_filterregistration.bas b/framework/test/test_filterregistration.bas
index 47a19acfc36d..831cbbab8914 100755
--- a/framework/test/test_filterregistration.bas
+++ b/framework/test/test_filterregistration.bas
@@ -64,7 +64,7 @@ rem Dim lFilters() as com.sun.star.beans.PropertyValue
for nCount=0 to ubound(lProperties()) step 1
sOut = sOut + lProperties(nCount).Name
sOut = sOut + " = "
-rem #85829# Disable follow if statement to produce bug!
+rem Disable follow if statement to produce bug!
rem if( lProperties(nCount).Name <> "UserData" ) then
sOut = sOut + lProperties(nCount).Value
rem endif
diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx
index e82fff4e454c..785ba77dcc29 100755
--- a/framework/test/threadtest/threadtest.cxx
+++ b/framework/test/threadtest/threadtest.cxx
@@ -547,11 +547,6 @@ void SAL_CALL TestThread::run()
// Work with class.
// Use random to select called method.
nA = (sal_Int32)getRandomValue();
- if( nA % 5 == 0 )
- {
- //nA = m_pClass->workA( nA, m_nThreadID );
- }
- else
if( nA % 3 == 0 )
{
m_pClass->setA( nA, m_nThreadID );
diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx
index 3fbd4913fb08..ca60ea1b2f7e 100755
--- a/framework/test/typecfg/cfgview.cxx
+++ b/framework/test/typecfg/cfgview.cxx
@@ -553,16 +553,6 @@ void CFGView::impl_generateFilterListHTML()
sAllFiltersHTML.appendAscii( "\t\t<table border=0><tr><td bgcolor=#ff8040><strong>Nr.</strong></td><td bgcolor=#ff8040><strong>Filter</strong></td></tr>\n" ); // open table
sFilterPropHTML.appendAscii( "<html>\n\t<head>\n\t\t<title>\n\t\t\tFilterProperties\n\t\t</title>\n\t</head>\n\t<body>\n" ); // open html
-/*
- ::framework::StringList lFilterNames;
- for( ConstFilterIterator pFilter=m_pData->aCFGView.begin(); pFilter!=m_pData->aCFGView.end(); ++pFilter )
- {
- lFilterNames.push_back( pFilter->first );
- }
- ::std::stable_sort( lFilterNames.begin(), lFilterNames.end() );
- css::uno::Sequence< ::rtl::OUString > lNames;
- ::framework::DataContainer::convertStringVectorToSequence( lFilterNames, lNames );
-*/
css::uno::Sequence< ::rtl::OUString > lNames = m_aData.pCache->getAllFilterNames() ;
sal_Int32 nFilterCounter = 0 ;
sal_Int32 nCount = lNames.getLength() ;
diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx
index cfd874081863..38b54ac19520 100755
--- a/framework/test/typecfg/xml2xcd.cxx
+++ b/framework/test/typecfg/xml2xcd.cxx
@@ -230,8 +230,6 @@ XCDGenerator gGenerator;
//*****************************************************************************************************************
void XCDGenerator::Main()
{
- // Must be :-)
-// impl_printCopyright();
// Init global servicemanager and set it.
// It's neccessary for other services ... e.g. configuration.
@@ -343,24 +341,6 @@ void XCDGenerator::impl_parseCommandLine( AppMember& rMember )
while( nArgument<nCount )
{
osl_getCommandArg( nArgument, &sArgument.pData );
-/*OBSOLETE
- //_____________________________________________________________________________________________________
- // look for "-fis=..."
- if( sArgument.compareTo( ARGUMENT_FILENAME_STANDARD, ARGUMENTLENGTH ) == ARGUMENTFOUND )
- {
- rMember.sFileNameStandard = sArgument.copy( ARGUMENTLENGTH, sArgument.getLength()-ARGUMENTLENGTH );
- ++nMinCount;
- }
- else
- //_____________________________________________________________________________________________________
- // look for "-fia=..."
- if( sArgument.compareTo( ARGUMENT_FILENAME_ADDITIONAL, ARGUMENTLENGTH ) == ARGUMENTFOUND )
- {
- rMember.sFileNameAdditional = sArgument.copy( ARGUMENTLENGTH, sArgument.getLength()-ARGUMENTLENGTH );
- ++nMinCount;
- }
- else
-*/
//_____________________________________________________________________________________________________
// look for "-pas=..."
if( sArgument.compareTo( ARGUMENT_PACKAGE_STANDARD, ARGUMENTLENGTH ) == ARGUMENTFOUND )