[Libreoffice-commits] core.git: sfx2/source
Caolán McNamara
caolanm at redhat.com
Sat Dec 24 15:41:46 UTC 2016
sfx2/source/appl/linkmgr2.cxx | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
New commits:
commit c0c6aac4c84521379a155bbe3bf24b674cfb7009
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Dec 24 15:40:58 2016 +0000
fix some whitespace formattting
Change-Id: I5b89aa3dbaab81df0c092fb64d2a26410390cefc
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 7b6a068..3da0210 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -63,13 +63,11 @@ public:
virtual bool Connect( sfx2::SvBaseLink* ) override;
};
-
LinkManager::LinkManager(SfxObjectShell* p)
: pPersist( p )
{
}
-
LinkManager::~LinkManager()
{
for(tools::SvRef<SvBaseLink> & rTmp : aLinkTbl)
@@ -101,7 +99,6 @@ void LinkManager::CloseCachedComps()
maCachedComps.clear();
}
-
void LinkManager::Remove( SvBaseLink *pLink )
{
// No duplicate links inserted
@@ -129,7 +126,6 @@ void LinkManager::Remove( SvBaseLink *pLink )
}
}
-
void LinkManager::Remove( size_t nPos, size_t nCnt )
{
if( nCnt && nPos < aLinkTbl.size() )
@@ -150,7 +146,6 @@ void LinkManager::Remove( size_t nPos, size_t nCnt )
}
}
-
bool LinkManager::Insert( SvBaseLink* pLink )
{
for( size_t n = 0; n < aLinkTbl.size(); ++n )
@@ -169,7 +164,6 @@ bool LinkManager::Insert( SvBaseLink* pLink )
return true;
}
-
bool LinkManager::InsertLink( SvBaseLink * pLink,
sal_uInt16 nObjType,
SfxLinkUpdateMode nUpdateMode,
@@ -183,7 +177,6 @@ bool LinkManager::InsertLink( SvBaseLink * pLink,
return Insert( pLink );
}
-
void LinkManager::InsertDDELink( SvBaseLink * pLink,
const OUString& rServer,
const OUString& rTopic,
@@ -200,7 +193,6 @@ void LinkManager::InsertDDELink( SvBaseLink * pLink,
Insert( pLink );
}
-
void LinkManager::InsertDDELink( SvBaseLink * pLink )
{
DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
@@ -213,7 +205,6 @@ void LinkManager::InsertDDELink( SvBaseLink * pLink )
Insert( pLink );
}
-
// Obtain the string for the dialog
bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
OUString* pType,
@@ -338,7 +329,6 @@ void LinkManager::UpdateAllLinks(
CloseCachedComps();
}
-
SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
{
switch( pLink->GetObjType() )
@@ -365,13 +355,11 @@ bool LinkManager::InsertServer( SvLinkSource* pObj )
return aServerTbl.insert( pObj ).second;
}
-
void LinkManager::RemoveServer( SvLinkSource* pObj )
{
aServerTbl.erase( pObj );
}
-
void MakeLnkName( OUString& rName, const OUString* pType, const OUString& rFile,
const OUString& rLink, const OUString* pFilter )
{
@@ -484,11 +472,12 @@ void LinkManager::CancelTransfers()
nullptr != ( pFileObj = static_cast<SvFileObject*>(pLnk->GetObj()) ) )
pFileObj->CancelTransfers();
}
- // For the purpose of sending Status information from the file object to
- // the base link, there exist a dedicated ClipBoardId. The SvData-object
- // gets the appropriate information as a string
- // For now this is required for file object in conjunction with JavaScript
- // - needs information about Load/Abort/Error
+
+// For the purpose of sending Status information from the file object to
+// the base link, there exist a dedicated ClipBoardId. The SvData-object
+// gets the appropriate information as a string
+// For now this is required for file object in conjunction with JavaScript
+// - needs information about Load/Abort/Error
SotClipboardFormatId LinkManager::RegisterStatusInfoId()
{
static SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
@@ -501,7 +490,6 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId()
return nFormat;
}
-
bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
const css::uno::Any & rValue,
Graphic& rGrf )
@@ -544,7 +532,6 @@ bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
return bRet;
}
-
OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL )
{
OUString sRet;
@@ -680,8 +667,6 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
return false;
}
-
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list