[Libreoffice-commits] .: framework/inc framework/qa framework/source framework/test
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Tue Mar 29 13:10:33 PDT 2011
framework/inc/classes/filtercachedata.hxx | 55 ----
framework/inc/classes/framecontainer.hxx | 8
framework/inc/classes/menumanager.hxx | 4
framework/inc/dispatch/dispatchprovider.hxx | 3
framework/inc/framework/actiontriggerhelper.hxx | 4
framework/inc/framework/eventsconfiguration.hxx | 3
framework/inc/framework/imagesconfiguration.hxx | 3
framework/inc/framework/menuconfiguration.hxx | 4
framework/inc/framework/toolboxconfiguration.hxx | 4
framework/inc/helper/statusindicatorfactory.hxx | 8
framework/inc/macros/debug/assertion.hxx | 4
framework/inc/services/contenthandlerfactory.hxx | 1
framework/inc/services/license.hxx | 16 -
framework/inc/services/logindialog.hxx | 2
framework/inc/services/tabwindowservice.hxx | 6
framework/inc/services/task.hxx | 124 ---------
framework/inc/uielement/menubarmanager.hxx | 4
framework/inc/uielement/menubarwrapper.hxx | 1
framework/inc/uifactory/factoryconfiguration.hxx | 1
framework/inc/uifactory/statusbarfactory.hxx | 1
framework/inc/uifactory/toolboxfactory.hxx | 1
framework/inc/xml/menudocumenthandler.hxx | 5
framework/qa/complex/api_internal/CheckAPI.java | 7
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 5
framework/qa/complex/desktop/DesktopTerminate.java | 1
framework/qa/complex/dispatches/Interceptor.java | 3
framework/qa/complex/framework/autosave/AutoSave.java | 10
framework/qa/complex/framework/recovery/RecoveryTest.java | 24 -
framework/qa/complex/imageManager/CheckImageManager.java | 28 --
framework/qa/complex/imageManager/_XComponent.java | 1
framework/qa/complex/imageManager/_XInitialization.java | 1
framework/qa/complex/imageManager/_XUIConfiguration.java | 1
framework/qa/complex/loadAllDocuments/InteractionHandler.java | 3
framework/qa/complex/loadAllDocuments/StatusIndicator.java | 20 -
framework/qa/complex/loadAllDocuments/StreamSimulator.java | 6
framework/qa/complex/path_settings/PathSettingsTest.java | 1
framework/source/accelerators/documentacceleratorconfiguration.cxx | 9
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 1
framework/source/classes/framecontainer.cxx | 12
framework/source/classes/fwktabwindow.cxx | 1
framework/source/classes/menumanager.cxx | 28 --
framework/source/dispatch/closedispatcher.cxx | 1
framework/source/dispatch/menudispatcher.cxx | 8
framework/source/dispatch/oxt_handler.cxx | 11
framework/source/fwe/helper/actiontriggerhelper.cxx | 1
framework/source/fwe/xml/eventsconfiguration.cxx | 10
framework/source/fwe/xml/imagesconfiguration.cxx | 9
framework/source/fwe/xml/menuconfiguration.cxx | 1
framework/source/fwe/xml/menudocumenthandler.cxx | 9
framework/source/fwe/xml/toolboxconfiguration.cxx | 4
framework/source/fwi/helper/mischelper.cxx | 2
framework/source/helper/dockingareadefaultacceptor.cxx | 4
framework/source/helper/statusindicatorfactory.cxx | 6
framework/source/helper/uiconfigelementwrapperbase.cxx | 4
framework/source/jobs/job.cxx | 3
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/loadenv/loadenv.cxx | 136 +---------
framework/source/services/autorecovery.cxx | 4
framework/source/services/backingcomp.cxx | 6
framework/source/services/desktop.cxx | 12
framework/source/services/dispatchhelper.cxx | 1
framework/source/services/frame.cxx | 6
framework/source/services/license.cxx | 13
framework/source/services/mediatypedetectionhelper.cxx | 1
framework/source/services/pathsettings.cxx | 16 -
framework/source/services/sessionlistener.cxx | 1
framework/source/services/substitutepathvars.cxx | 5
framework/source/services/taskcreatorsrv.cxx | 3
framework/source/tabwin/tabwindow.cxx | 1
framework/source/tabwin/tabwinfactory.cxx | 1
framework/source/uiconfiguration/globalsettings.cxx | 2
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 1
framework/source/uiconfiguration/uicategorydescription.cxx | 2
framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx | 15 -
framework/source/uiconfiguration/windowstateconfiguration.cxx | 4
framework/source/uielement/controlmenucontroller.cxx | 1
framework/source/uielement/fontmenucontroller.cxx | 1
framework/source/uielement/fontsizemenucontroller.cxx | 1
framework/source/uielement/footermenucontroller.cxx | 1
framework/source/uielement/headermenucontroller.cxx | 1
framework/source/uielement/langselectionmenucontroller.cxx | 3
framework/source/uielement/langselectionstatusbarcontroller.cxx | 9
framework/source/uielement/macrosmenucontroller.cxx | 5
framework/source/uielement/menubarmanager.cxx | 17 -
framework/source/uielement/menubarwrapper.cxx | 2
framework/source/uielement/newmenucontroller.cxx | 11
framework/source/uielement/objectmenucontroller.cxx | 1
framework/source/uielement/recentfilesmenucontroller.cxx | 1
framework/source/uielement/toolbarmanager.cxx | 18 -
framework/source/uielement/toolbarsmenucontroller.cxx | 1
framework/source/uielement/uicommanddescription.cxx | 3
framework/source/uifactory/addonstoolboxfactory.cxx | 1
framework/source/uifactory/factoryconfiguration.cxx | 2
framework/source/uifactory/menubarfactory.cxx | 1
framework/source/uifactory/popupmenucontrollerfactory.cxx | 2
framework/source/uifactory/statusbarcontrollerfactory.cxx | 2
framework/source/uifactory/statusbarfactory.cxx | 1
framework/source/uifactory/toolbarcontrollerfactory.cxx | 2
framework/source/uifactory/toolboxfactory.cxx | 1
framework/source/uifactory/uielementfactorymanager.cxx | 2
framework/source/uifactory/windowcontentfactorymanager.cxx | 27 -
framework/test/test.cxx | 46 ---
framework/test/test_filterregistration.bas | 2
framework/test/threadtest/threadtest.cxx | 5
framework/test/typecfg/cfgview.cxx | 10
framework/test/typecfg/xml2xcd.cxx | 20 -
106 files changed, 44 insertions(+), 884 deletions(-)
New commits:
commit 240dd8f13f7d660d7228a3054a1b8d619ac96e08
Author: Xisco Fauli <anistenis at gmail.com>
Date: Tue Mar 29 22:09:35 2011 +0200
Remove commented code in libs-core/framework
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 317bbd2..a960a70 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 b627157..7d89bdd 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 4a8123f..b19aecf 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 bad8ea4..ca80ae2 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 c6f3008..30676d9 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 9ba8b43..aaa7650 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 589731b..79b6fe1 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 e9e4d82..f5dc8ef 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 ee83f9a..1f88831 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 b67f471..18c884e 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 1b34daa..92180d1 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 57bf711..1aa38cb 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 edc704a..18dc0a6 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 c4d8ec7..035f630 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 3df7d18..66719c2 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 074e225..3862c45 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 44fef4d..4b859bb 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 211ba10..8b0a9a0 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 4ec38b4..8795ab5 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 f8753db..77494b9 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 5269e3e..aec7ffb 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 166169a..1377b9b 100755
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -121,13 +121,11 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Stru
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 c712f0a..f4c7c53 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 3447f92..b017c7b 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 b5c0a73..e2132b8 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 f7edf93..d08cf0d 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 95f1179..ce8133d 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 5cd0597..5e81a42 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 f2a6cb1..1a176b2 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 10545f6..676669a 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 38af77b..36541d8 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 da1c81a..5bdf36c 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 7bbb50e..4a7553f 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 cdbce9d..b1dab34 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 6214963..e66995f 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 527176a..30f0e8a 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 0ad751e..cfe5f19 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 da14ccd..0164694 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 90be4cf..dc79ae4 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 ad171f0..b7c8848 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 b7357d1..b8c25e5 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 df76e0a..c680fb0 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 b8af8ef..fc075ab 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 45456d1..4a0c9a1 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 fd7a0f7..06f18ba 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 9d6e45a..f1583b5 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 083c4e7..ad50a2b 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 6dc8d64..a6b7eed 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 f093531..2f9a2e7 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 871d377..a7bf599 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 194c4fa..d8b75fa 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 a1e0777..a3683fe 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 64cd2ca..920b4ae 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 c6b0719..9b8c031 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 15d1c76..b25a14c 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 2f1dc05..f23a888 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 0f52059..49c28d6 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 73b5987..9b77c6b 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 c8e5fd4..71e924e 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 69c415d..d47498b 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 f372875..ef2aff8 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 462e69c..550b782 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 e59da1d..c7e27f4 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 e9dd2b7..5578b34 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 29620b6..c80d401 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 at 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 ...
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list