[Libreoffice-commits] core.git: framework/inc framework/source
Hussian Alamri
husain.amri at me.com
Wed May 14 06:16:44 PDT 2014
framework/inc/classes/filtercachedata.hxx | 5 -
framework/inc/dispatch/menudispatcher.hxx | 1
framework/inc/dispatch/oxt_handler.hxx | 2
framework/inc/dispatch/popupmenudispatcher.hxx | 1
framework/inc/helper/ocomponentaccess.hxx | 1
framework/inc/helper/ocomponentenumeration.hxx | 1
framework/inc/services/desktop.hxx | 1
framework/inc/threadhelp/transactionguard.hxx | 1
framework/source/dispatch/menudispatcher.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 29 ----------
framework/source/helper/ocomponentaccess.cxx | 2
framework/source/helper/oframes.cxx | 1
framework/source/services/frame.cxx | 1
framework/source/services/substitutepathvars.cxx | 1
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 1
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 1
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 1
17 files changed, 1 insertion(+), 51 deletions(-)
New commits:
commit 493bd11fcb1305e761daddb79457e84322593b53
Author: Hussian Alamri <husain.amri at me.com>
Date: Tue May 13 18:50:42 2014 -0400
Removed redundant private methods comments
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 6f70eb1..7ccd82e 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -82,7 +82,6 @@ struct FileType
inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- // private methods
private:
@@ -143,7 +142,6 @@ struct Filter
inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- // private methods
private:
@@ -212,7 +210,6 @@ struct Detector
inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- // private methods
private:
@@ -254,7 +251,6 @@ struct Loader
inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- // private methods
private:
@@ -298,7 +294,6 @@ struct ContentHandler
inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
- // private methods
private:
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 92bde6d..a1d3f75 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -155,7 +155,6 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
virtual ~MenuDispatcher();
- // private methods
private:
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index b8d6d2e..b32a53e 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -93,8 +93,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3<
protected:
- // private methods
-
private:
// variables
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 8c60489..d216326 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -121,7 +121,6 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper5<
void impl_RetrievePopupControllerQuery();
void impl_CreateUriRefFactory();
- // private methods
// variables
private:
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 570ae47..d97a74a 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -129,7 +129,6 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
virtual ~OComponentAccess();
- // private methods
private:
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index 8a7a40d..6c4b0a4 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -141,7 +141,6 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
virtual void impl_resetObject();
- // private methods
private:
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index ed08671..57e0bdb 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -318,7 +318,6 @@ class Desktop : private cppu::BaseMutex,
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper ( ) SAL_OVERRIDE;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // private methods
private:
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 3690adc..10d9b01 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -99,7 +99,6 @@ class TransactionGuard : private boost::noncopyable
}
}
- // private methods
private:
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index a684628..3f96f73 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -199,7 +199,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
}
}
-// private method
void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
{
@@ -218,7 +217,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
}
}
-// private method
bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource )
{
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index d09707e..49f15df 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -256,7 +256,6 @@ class AddonsOptions_Impl : public ConfigItem
const MergeStatusbarInstructionContainer& GetMergeStatusbarInstructions() const;
void ReadConfigurationData();
- // private methods
private:
enum ImageSize
@@ -625,7 +624,6 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool
return aImage;
}
-// private method
bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
{
@@ -663,7 +661,6 @@ bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >
return ( rAddonMenuSeq.getLength() > 0 );
}
-// private method
bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
{
@@ -701,7 +698,6 @@ bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue >
return ( rAddonOfficeHelpMenuSeq.getLength() > 0 );
}
-// private method
bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
{
@@ -756,7 +752,6 @@ bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue
return ( rAddonOfficeMenuBarSeq.getLength() > 0 );
}
-// private method
bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
{
@@ -778,7 +773,6 @@ bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBa
return ( !rAddonOfficeToolBars.empty() );
}
-// private method
bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
{
@@ -814,7 +808,7 @@ bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNode
return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength() > nToolBarItemCount );
}
-// private method
+
void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
{
// Read the user-defined Images set and fill image manager
@@ -864,7 +858,6 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
}
}
-// private method
OUString AddonsOptions_Impl::GeneratePrefixURL()
{
@@ -878,7 +871,6 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
return aPopupMenuURL;
}
-// private method
bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
{
@@ -946,7 +938,6 @@ bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContaine
return true;
}
-// private method
bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
{
@@ -962,7 +953,6 @@ bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructi
return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
}
-// private method
bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
{
@@ -1036,7 +1026,6 @@ bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction
return true;
}
-// private method
bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
{
@@ -1182,7 +1171,6 @@ bool AddonsOptions_Impl::ReadStatusBarItem(
return bResult;
}
-// private method
bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu )
{
@@ -1255,7 +1243,6 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence<
return bResult;
}
-// private method
bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
{
@@ -1295,7 +1282,6 @@ bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequ
return bResult;
}
-// private method
bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
{
@@ -1315,7 +1301,6 @@ bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopu
return true;
}
-// private method
bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
{
@@ -1371,7 +1356,6 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName,
return bResult;
}
-// private method
bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
{
@@ -1400,7 +1384,6 @@ bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMen
return true;
}
-// private method
bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
{
@@ -1409,7 +1392,6 @@ bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
return ( pIter != m_aImageManager.end() );
}
-// private method
void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
{
@@ -1425,7 +1407,6 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
}
}
-// private method
Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
{
@@ -1458,7 +1439,6 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
return aImage;
}
-// private method
void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId )
{
@@ -1485,7 +1465,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS
m_aImageManager.insert( ImageManager::value_type( aURL, aImageEntry ));
}
-// private method
AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName )
{
@@ -1533,7 +1512,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin
return pEntry;
}
-// private method
bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const
{
@@ -1574,7 +1552,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
return lResult;
}
-// private method
Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const
{
@@ -1589,7 +1566,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri
return lResult;
}
-// private method
Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const
{
@@ -1623,7 +1599,6 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem(
return lResult;
}
-// private method
Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const
{
@@ -1777,7 +1752,6 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const
return GetImageFromURL( aURL, bBig, false );
}
-// private method
Mutex& AddonsOptions::GetOwnStaticMutex()
{
@@ -1801,7 +1775,6 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
return *pMutex;
}
-// private method
IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG )
{
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index e357bde..653fb2b 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -104,7 +104,6 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::
return bReturn;
}
-// private method
void OComponentAccess::impl_collectAllChildComponents( const css::uno::Reference< XFramesSupplier >& xNode ,
Sequence< css::uno::Reference< XComponent > >& seqComponents )
@@ -137,7 +136,6 @@ void OComponentAccess::impl_collectAllChildComponents( const css::uno::Refere
// ... otherwise break a recursive path and go back at current stack!
}
-// private method
css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const
{
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 3b0a628..7e46d436 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -297,7 +297,6 @@ void OFrames::impl_resetObject()
m_pFrameContainer = NULL;
}
-// private method
void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination ,
const Sequence< css::uno::Reference< XFrame > >& seqSource )
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 89b1ce9..9c78eab 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -320,7 +320,6 @@ private:
virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ) SAL_OVERRIDE;
-// private methods
private:
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index c3cb4da..b87b66e 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -462,7 +462,6 @@ void SubstitutePathVariables_Impl::Commit()
{
}
-// private methods
OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
{
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 8366c4c..3546c9a 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -96,7 +96,6 @@ private:
//TODO_AS void impl_initStorages();
- // private methods
ModuleToModuleCfgMgr m_aModuleToModuleUICfgMgrMap;
css::uno::Reference< css::frame::XModuleManager2 > m_xModuleMgr;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index dd3839b..384ba7a 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -185,7 +185,6 @@ private:
typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
- // private methods
void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index c065083..8ac7dcc 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -171,7 +171,6 @@ private:
typedef ::std::vector< css::ui::ConfigurationEvent > ConfigEventNotifyContainer;
typedef ::boost::unordered_map< OUString, UIElementInfo, OUStringHash, ::std::equal_to< OUString > > UIElementInfoHashMap;
- // private methods
void impl_Initialize();
void implts_notifyContainerListener( const css::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
void impl_fillSequenceWithElementTypeInfo( UIElementInfoHashMap& aUIElementInfoCollection, sal_Int16 nElementType );
More information about the Libreoffice-commits
mailing list