[Libreoffice-commits] core.git: framework/source
Hussian Alamri
husain.amri at me.com
Sat May 17 13:13:49 PDT 2014
framework/source/dispatch/menudispatcher.cxx | 2 -
framework/source/fwe/classes/addonsoptions.cxx | 27 -----------------------
framework/source/helper/ocomponentaccess.cxx | 1
framework/source/helper/oframes.cxx | 1
framework/source/services/substitutepathvars.cxx | 1
5 files changed, 32 deletions(-)
New commits:
commit b1e29a6ac51f87f893fe64986311af7dcd18754b
Author: Hussian Alamri <husain.amri at me.com>
Date: Thu May 15 16:52:14 2014 -0400
Single line between methods
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 3f96f73..886bf65 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
}
}
-
void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
{
for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
@@ -217,7 +216,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
}
}
-
bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource )
{
uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY );
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 49f15df..5ec0e61 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -624,7 +624,6 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, bool bBig, bool
return aImage;
}
-
bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
{
// Read the AddonMenu set and fill property sequences
@@ -661,7 +660,6 @@ bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >
return ( rAddonMenuSeq.getLength() > 0 );
}
-
bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
{
// Read the AddonMenu set and fill property sequences
@@ -698,7 +696,6 @@ bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue >
return ( rAddonOfficeHelpMenuSeq.getLength() > 0 );
}
-
bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
{
// Read the OfficeMenuBar set and fill property sequences
@@ -752,7 +749,6 @@ bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue
return ( rAddonOfficeMenuBarSeq.getLength() > 0 );
}
-
bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
{
// Read the OfficeToolBar set and fill property sequences
@@ -773,7 +769,6 @@ bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBa
return ( !rAddonOfficeToolBars.empty() );
}
-
bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
{
sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength();
@@ -808,7 +803,6 @@ bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNode
return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength() > nToolBarItemCount );
}
-
void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
{
// Read the user-defined Images set and fill image manager
@@ -858,7 +852,6 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
}
}
-
OUString AddonsOptions_Impl::GeneratePrefixURL()
{
// Create an unique prefixed Add-On popup menu URL so it can be identified later as a runtime popup menu.
@@ -871,7 +864,6 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
return aPopupMenuURL;
}
-
bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
{
const OUString aMenuMergeRootName( "AddonUI/OfficeMenuBarMerging/" );
@@ -938,7 +930,6 @@ bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContaine
return true;
}
-
bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
{
OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] );
@@ -953,7 +944,6 @@ bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructi
return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
}
-
bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
{
const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" );
@@ -1026,7 +1016,6 @@ bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruction
return true;
}
-
bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
{
OUStringBuffer aBuffer( aMergeAddonInstructionBase );
@@ -1171,7 +1160,6 @@ bool AddonsOptions_Impl::ReadStatusBarItem(
return bResult;
}
-
bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, bool bIgnoreSubMenu )
{
bool bResult = false;
@@ -1243,7 +1231,6 @@ bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence<
return bResult;
}
-
bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
{
bool bResult = false;
@@ -1282,7 +1269,6 @@ bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequ
return bResult;
}
-
bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
{
Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq;
@@ -1301,7 +1287,6 @@ bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopu
return true;
}
-
bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
{
bool bResult = false;
@@ -1356,7 +1341,6 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName,
return bResult;
}
-
bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
{
Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM );
@@ -1384,7 +1368,6 @@ bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMen
return true;
}
-
bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
{
// FIXME: potentially this is not so useful in a world of delayed image loading
@@ -1392,7 +1375,6 @@ bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
return ( pIter != m_aImageManager.end() );
}
-
void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
{
if ( aURL.startsWith( EXPAND_PROTOCOL ) )
@@ -1407,7 +1389,6 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
}
}
-
Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
{
Image aImage;
@@ -1439,7 +1420,6 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
return aImage;
}
-
void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId )
{
if ( aImageId.isEmpty() )
@@ -1465,7 +1445,6 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS
m_aImageManager.insert( ImageManager::value_type( aURL, aImageEntry ));
}
-
AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName )
{
Sequence< OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName );
@@ -1512,7 +1491,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin
return pEntry;
}
-
bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const
{
bool bResult = false;
@@ -1552,7 +1530,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
return lResult;
}
-
Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const
{
// The URL is automatically set and not read from the configuration.
@@ -1566,7 +1543,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri
return lResult;
}
-
Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const
{
Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
@@ -1599,7 +1575,6 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem(
return lResult;
}
-
Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const
{
Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES );
@@ -1752,7 +1727,6 @@ Image AddonsOptions::GetImageFromURL( const OUString& aURL, bool bBig ) const
return GetImageFromURL( aURL, bBig, false );
}
-
Mutex& AddonsOptions::GetOwnStaticMutex()
{
// Initialize static mutex only for one time!
@@ -1775,7 +1749,6 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
return *pMutex;
}
-
IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG )
{
MutexGuard aGuard( GetOwnStaticMutex() );
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 653fb2b..12206c1 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -136,7 +136,6 @@ void OComponentAccess::impl_collectAllChildComponents( const css::uno::Refere
// ... otherwise break a recursive path and go back at current stack!
}
-
css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const
{
// Set default return value, if method failed.
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 7e46d436..7d86c50 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -297,7 +297,6 @@ void OFrames::impl_resetObject()
m_pFrameContainer = NULL;
}
-
void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >& seqDestination ,
const Sequence< css::uno::Reference< XFrame > >& seqSource )
{
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index b87b66e..deed622 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -462,7 +462,6 @@ void SubstitutePathVariables_Impl::Commit()
{
}
-
OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
{
#ifdef SOLARIS
More information about the Libreoffice-commits
mailing list