summaryrefslogtreecommitdiff
path: root/svx/source/unodraw
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 20:51:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-26 07:42:24 -0600
commitb1181b89f3c6a0b435f49d9b2bfa18db2b5f6f3c (patch)
tree1ccd7fbb50f8ef1a6ac846e178550da83cd263ca /svx/source/unodraw
parent060ab521fa0d5d6b9fcb97eab4718c04e8aec944 (diff)
Remove visual noise from svx
Change-Id: I56497d953b0500ba0967fddb36ca8bbbe86c62ad Reviewed-on: https://gerrit.libreoffice.org/8321 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx12
-rw-r--r--svx/source/unodraw/recoveryui.cxx16
-rw-r--r--svx/source/unodraw/shapeimpl.hxx2
-rw-r--r--svx/source/unodraw/shapepropertynotifier.cxx24
-rw-r--r--svx/source/unodraw/tableshape.cxx2
-rw-r--r--svx/source/unodraw/unomod.cxx18
-rw-r--r--svx/source/unodraw/unoprov.cxx8
-rw-r--r--svx/source/unodraw/unoshap2.cxx2
-rw-r--r--svx/source/unodraw/unoshap4.cxx10
-rw-r--r--svx/source/unodraw/unoshtxt.cxx4
10 files changed, 48 insertions, 50 deletions
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 6c74a99386fc..c6d1ad904331 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -247,7 +247,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( )
return getCount() != 0;
}
-///////////////////////////////////////////////////////////////////////
+
class SvxUnoXColorTable : public SvxUnoXPropertyTable
{
@@ -309,7 +309,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames(
return aServices;
}
-///////////////////////////////////////////////////////////////////////
+
class SvxUnoXLineEndTable : public SvxUnoXPropertyTable
{
@@ -382,7 +382,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceName
return aServices;
}
-///////////////////////////////////////////////////////////////////////
+
class SvxUnoXDashTable : public SvxUnoXPropertyTable
{
@@ -463,7 +463,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames(
return aServices;
}
-///////////////////////////////////////////////////////////////////////
+
class SvxUnoXHatchTable : public SvxUnoXPropertyTable
{
@@ -539,7 +539,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames(
return aServices;
}
-///////////////////////////////////////////////////////////////////////
+
class SvxUnoXGradientTable : public SvxUnoXPropertyTable
{
@@ -627,7 +627,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNam
return aServices;
}
-///////////////////////////////////////////////////////////////////////
+
class SvxUnoXBitmapTable : public SvxUnoXPropertyTable
{
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index dfdb83596669..3054ad3e36a5 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -195,7 +195,7 @@ css::uno::Any SAL_CALL RecoveryUI::dispatchWithReturnValue(const css::util::URL&
return aRet;
}
-//===============================================
+
void SAL_CALL RecoveryUI::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
throw(css::uno::RuntimeException)
@@ -204,14 +204,14 @@ void SAL_CALL RecoveryUI::dispatch(const css::util::URL&
dispatchWithReturnValue(aURL, lArguments);
}
-//===============================================
+
void SAL_CALL RecoveryUI::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& ) throw(css::uno::RuntimeException)
{
// TODO
OSL_FAIL("RecoveryUI::addStatusListener()\nNot implemented yet!");
}
-//===============================================
+
void SAL_CALL RecoveryUI::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >&, const css::util::URL& )
throw(css::uno::RuntimeException)
{
@@ -237,7 +237,7 @@ static OUString GetCrashConfigDir()
return ustrValue;
}
-//===============================================
+
#if defined(WNT)
#define LCKFILE "crashdat.lck"
@@ -252,7 +252,7 @@ static OUString GetUnsentURL()
return aURL;
}
-//===============================================
+
static bool delete_pending_crash()
{
@@ -274,7 +274,7 @@ RecoveryUI::EJob RecoveryUI::impl_classifyJob(const css::util::URL& aURL)
return m_eJob;
}
-//===============================================
+
sal_Bool RecoveryUI::impl_doEmergencySave()
{
// create core service, which implements the real "emergency save" algorithm.
@@ -296,7 +296,7 @@ sal_Bool RecoveryUI::impl_doEmergencySave()
return (nRet==DLG_RET_OK_AUTOLUNCH);
}
-//===============================================
+
void RecoveryUI::impl_doRecovery()
{
// create core service, which implements the real "emergency save" algorithm.
@@ -324,7 +324,7 @@ void RecoveryUI::impl_doRecovery()
delete_pending_crash();
}
-//===============================================
+
void RecoveryUI::impl_showAllRecoveredDocs()
{
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index 9be6beb08904..f28ff180c43f 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -102,7 +102,7 @@ public:
};
-// ====================================================================
+
class SvxTableShape : public SvxShape
{
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index b208dfbfcb5c..612586455660 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -40,10 +40,10 @@ namespace
};
}
-//........................................................................
+
namespace svx
{
-//........................................................................
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
@@ -67,16 +67,16 @@ namespace svx
, OUStringHash
> PropertyChangeListenerContainer;
- //====================================================================
+
//= IPropertyValueProvider
- //====================================================================
+
IPropertyValueProvider::~IPropertyValueProvider()
{
}
- //====================================================================
+
//= PropertyChangeNotifier_Data
- //====================================================================
+
struct PropertyChangeNotifier_Data
{
::cppu::OWeakObject& m_rContext;
@@ -89,9 +89,9 @@ namespace svx
{
}
};
- //====================================================================
+
//= PropertyValueProvider
- //====================================================================
+
OUString PropertyValueProvider::getPropertyName() const
{
@@ -105,9 +105,9 @@ namespace svx
_out_rValue = xContextProps->getPropertyValue( getPropertyName() );
}
- //====================================================================
+
//= PropertyChangeNotifier
- //====================================================================
+
PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex )
:m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) )
@@ -187,8 +187,8 @@ namespace svx
m_pData->m_aPropertyChangeListeners.disposeAndClear( aEvent );
}
-//........................................................................
+
} // namespace svx
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 627019725cc3..5af2ac07428b 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -23,7 +23,7 @@
#include "svx/svdotable.hxx"
#include <svx/svdpool.hxx>
-///////////////////////////////////////////////////////////////////////
+
using namespace ::osl;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index cc62ba4a0d0f..153a348121d6 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -53,19 +53,19 @@
#include <com/sun/star/text/textfield/Type.hpp>
-//-////////////////////////////////////////////////////////////////////
+//-
using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star;
-//-////////////////////////////////////////////////////////////////////
+//-
#define QUERYINT( xint ) \
if( rType == ::getCppuType((const uno::Reference< xint >*)0) ) \
aAny <<= uno::Reference< xint >(this)
-//-////////////////////////////////////////////////////////////////////
+//-
class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo >
{
@@ -93,7 +93,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
};
-//-////////////////////////////////////////////////////////////////////
+//-
static const SvEventDescription* ImplGetSupportedMacroItems()
{
@@ -107,7 +107,7 @@ static const SvEventDescription* ImplGetSupportedMacroItems()
return aMacroDescriptionsImpl;
}
-//-////////////////////////////////////////////////////////////////////
+//-
/** fills the given EventObject from the given SdrHint.
@returns
@@ -251,8 +251,6 @@ uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence
return aSeq;
}
-
-///
SvxUnoDrawingModel::SvxUnoDrawingModel( SdrModel* pDoc ) throw()
: mpDoc( pDoc )
{
@@ -586,9 +584,9 @@ uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::
return SvxCreateNumRuleCompare();
}
-//=============================================================================
+
// class SvxUnoDrawPagesAccess
-//=============================================================================
+
SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw()
: mrModel(rMyModel)
@@ -753,6 +751,6 @@ com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCr
}
}
-///////////////////////////////////////////////////////////////////////
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 5dd9ed6f136a..986c290e4544 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1177,13 +1177,13 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
return false;
}
-//////////////////////////////////////////////////////////////////////////////
+
// #i122649# Some comments on the below arrays:
// - They need to have the same order and count of items
// - They are used to translate between translated and non-translated color names
// - To make longer names be found which start with the same basic string,
// these have to be in front of others
-//
+
// It would be nice to:
// - evtl. organize these in a single array with 2-dimensional inner to elliminate
// the possibility to define it wrong
@@ -1277,7 +1277,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] =
RID_SVXSTR_COLOR_TANGO_ALUMINIUM
};
-//////////////////////////////////////////////////////////////////////////////
+
bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw()
{
@@ -1373,7 +1373,7 @@ OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rA
return rApiName;
}
-///////////////////////////////////////////////////////////////////////
+
comphelper::PropertySetInfo* SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw()
{
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index bc4f6fafccd2..bf042fcccd28 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1726,7 +1726,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte
return true;
}
-///////////////////////////////////////////////////////////////////////
+
SvxShapeCaption::SvxShapeCaption( SdrObject* pObj ) throw()
: SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CAPTION), getSvxMapProvider().GetPropertySet(SVXMAP_CAPTION, SdrObject::GetGlobalDrawObjectItemPool()) )
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 96ce7103a8e9..2ceea1e86ab1 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -52,7 +52,7 @@
#include "svx/svdstr.hrc"
#include <vcl/wmf.hxx>
-///////////////////////////////////////////////////////////////////////
+
using namespace ::osl;
using namespace ::rtl;
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::beans;
-///////////////////////////////////////////////////////////////////////
+
SvxOle2Shape::SvxOle2Shape( SdrObject* pObject ) throw()
: SvxShapeText( pObject, getSvxMapProvider().GetMap(SVXMAP_OLE2),
getSvxMapProvider().GetPropertySet(SVXMAP_OLE2,SdrObject::GetGlobalDrawObjectItemPool()) )
@@ -566,7 +566,7 @@ const SvGlobalName SvxOle2Shape::GetClassName_Impl(OUString& rHexCLSID)
return aClassName;
}
-///////////////////////////////////////////////////////////////////////
+
SvxAppletShape::SvxAppletShape( SdrObject* pObject ) throw()
: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_APPLET), getSvxMapProvider().GetPropertySet(SVXMAP_APPLET, SdrObject::GetGlobalDrawObjectItemPool()) )
@@ -639,7 +639,7 @@ bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
}
}
-///////////////////////////////////////////////////////////////////////
+
SvxPluginShape::SvxPluginShape( SdrObject* pObject ) throw()
: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_PLUGIN), getSvxMapProvider().GetPropertySet(SVXMAP_PLUGIN, SdrObject::GetGlobalDrawObjectItemPool()) )
@@ -712,7 +712,7 @@ bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
}
}
-///////////////////////////////////////////////////////////////////////
+
SvxFrameShape::SvxFrameShape( SdrObject* pObject ) throw()
: SvxOle2Shape( pObject, getSvxMapProvider().GetMap(SVXMAP_FRAME), getSvxMapProvider().GetPropertySet(SVXMAP_FRAME, SdrObject::GetGlobalDrawObjectItemPool()) )
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 96a456600f33..3c72deaa3ed1 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -379,7 +379,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
// #104157# Update maTextOffset, object has changed
// #105196#, #105203#: Cannot call that // here,
- // since TakeTextRect() (called from there) //
+ // since TakeTextRect() (called from there)
// changes outliner content.
// UpdateOutliner();
@@ -399,7 +399,7 @@ void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
// will replace the Notifer for current editable cell. It
// is totally wrong. So add check here to avoid the
// incorrect replacement of notifer.
- //
+
// Currently it only happens on the editsource of
// AccessibleCell
if (mpObject && mpText)