[Libreoffice-commits] .: 6 commits - avmedia/source configmgr/qa configmgr/source connectivity/source embeddedobj/source framework/inc framework/source linguistic/source sfx2/source shell/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Jan 31 00:59:00 PST 2011
avmedia/source/win/window.cxx | 32 ----
configmgr/qa/unit/test.cxx | 8 -
configmgr/source/access.hxx | 8 -
configmgr/source/childaccess.hxx | 6
configmgr/source/node.hxx | 6
configmgr/source/nodemap.hxx | 2
configmgr/source/xmlreader.hxx | 7 -
connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx | 7 -
connectivity/source/inc/ado/Awrapado.hxx | 21 ---
embeddedobj/source/msole/olecomponent.hxx | 14 --
framework/inc/classes/sfxhelperfunctions.hxx | 67 +++++++---
framework/inc/dispatch/oxt_handler.hxx | 18 --
framework/source/accelerators/acceleratorconfiguration.cxx | 11 -
framework/source/helper/titlebarupdate.cxx | 27 ----
linguistic/source/iprcache.cxx | 20 --
sfx2/source/control/dispatch.cxx | 6
sfx2/source/dialog/mgetempl.cxx | 38 -----
shell/inc/internal/dbgmacros.hxx | 8 -
18 files changed, 48 insertions(+), 258 deletions(-)
New commits:
commit 96f281cb61bbd9d4cb5d53de30c74cf6767790f7
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 09:47:31 2011 +0100
Remove unused DBG_STATISTIC, IPR_CACHE_MAX and IPR_CACHE_MAXINPUT
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index 185e1e7..dcfa48f 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -37,27 +37,7 @@
#include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
#include <tools/debug.hxx>
#include <osl/mutex.hxx>
-
-//#define IPR_DEF_CACHE_SIZE 503
-#define IPR_DEF_CACHE_MAX 375
-#define IPR_DEF_CACHE_MAXINPUT 200
-
-#ifdef DBG_STATISTIC
-#include <tools/stream.hxx>
-
-//#define IPR_CACHE_SIZE nTblSize
-#define IPR_CACHE_MAX nMax
-#define IPR_CACHE_MAXINPUT nMaxInput
-
-#else
-
-//#define IPR_CACHE_SIZE IPR_DEF_CACHE_SIZE
-#define IPR_CACHE_MAX IPR_DEF_CACHE_MAX
-#define IPR_CACHE_MAXINPUT IPR_DEF_CACHE_MAXINPUT
-
-#endif
#include <unotools/processfactory.hxx>
-
#include <lngprops.hxx>
using namespace utl;
commit 638beee63d5b510dab2d8d167739429a73714752
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 09:46:54 2011 +0100
Remove DBG_UTIL_MESSEHACK_AUSKOMMENT
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 6e7b7b8..e45703e 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1959,12 +1959,6 @@ void SfxDispatcher::FlushImpl()
{
pImp->bFlushing = sal_True;
DBG_PROFSTOP(SfxDispatcherFlush);
-//!
-#ifdef DBG_UTIL_MESSEHACK_AUSKOMMENT
- DBG_ERROR( "reentering SfxDispatcher::Flush()" );
- aMsg += " reentering, aborted";
- DbgTrace( aMsg.GetBuffer() );
-#endif
return;
}
commit fb0021f3f812d9ce53ff7aeb16117e1d97993b6b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 00:47:35 2011 +0100
Remove DDRAW_TEST_OUTPUT.
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 3c2006a..917d9f7 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -342,33 +342,6 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments )
{
::SetWindowLong( (HWND) mnFrameWnd, 0, (DWORD) this );
-#ifdef DDRAW_TEST_OUTPUT
- IDirectDraw7* pDDraw;
- IDirectDrawSurface7* pDDSurface;
- IDirectDrawClipper* pDDClipper;
-
- if( DD_OK == DirectDrawCreateEx( NULL, (void**) &pDDraw, IID_IDirectDraw7, NULL ) )
- {
- if( DD_OK == pDDraw->SetCooperativeLevel( (HWND) mnParentWnd, DDSCL_NORMAL ) )
- {
- DDSURFACEDESC2 aDDDesc;
-
- memset( &aDDDesc, 0, sizeof( aDDDesc ) );
- aDDDesc.dwSize = sizeof( aDDDesc );
- aDDDesc.dwFlags = DDSD_CAPS;
- aDDDesc.ddsCaps.dwCaps |= DDSCAPS_PRIMARYSURFACE;
-
- if( DD_OK == pDDraw->CreateSurface( &aDDDesc, &pDDSurface, NULL ) )
- {
- if( DD_OK == pDDraw->CreateClipper( 0, &pDDClipper, NULL ) )
- {
- pDDClipper->SetHWnd( 0, (HWND) mnFrameWnd );
- pDDSurface->SetClipper( pDDClipper );
- }
-
- mrPlayer.setDDrawParams( (IDirectDraw*) pDDraw, (IDirectDrawSurface*) pDDSurface );
-#endif
-
pVideoWindow->put_Owner( (OAHWND) mnFrameWnd );
pVideoWindow->put_MessageDrain( (OAHWND) mnFrameWnd );
pVideoWindow->put_WindowStyle( WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN );
@@ -377,11 +350,6 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments )
meZoomLevel = media::ZoomLevel_ORIGINAL;
ImplLayoutVideoWindow();
-#ifdef DDRAW_TEST_OUTPUT
- }
- }
- }
-#endif
}
}
commit 7f96f90bec00bd6c5d001ee3131f3381fc4508cf
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 00:41:38 2011 +0100
Remove COPY_TO_TITLE_FOR_DEBUG.
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 77f8906..3a32702 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -249,9 +249,6 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
)
{
WorkWindow* pWorkWindow = (WorkWindow*)pWindow;
-#ifdef COPY_TO_TITLE_FOR_DEBUG
- pWorkWindow->SetText( sApplicationID );
-#endif
pWorkWindow->SetApplicationID( sApplicationID );
}
// <- VCL SYNCHRONIZED
commit 0ad7b154f93b18a4dfe55ecb96e4ff49dc1d28fb
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 00:39:18 2011 +0100
Remove double line spacing.
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index e3eb5a2..fe8d29e 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -88,23 +88,15 @@ void normalize(
class Test: public CppUnit::TestFixture {
public:
virtual void setUp();
-
virtual void tearDown();
void testKeyFetch();
-
void testKeySet();
-
void testKeyReset();
-
void testSetSetMemberName();
-
void testReadCommands();
-
void testThreads();
-
void testRecursive();
-
void testCrossThreads();
css::uno::Any getKey(
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 8a05329..bf314f2 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -130,15 +130,12 @@ public:
bool isValue();
void markChildAsModified(rtl::Reference< ChildAccess > const & child);
-
void releaseChild(rtl::OUString const & name);
virtual Path getAbsolutePath() = 0;
-
virtual Path getRelativePath() = 0;
virtual rtl::OUString getRelativePathRepresentation() = 0;
-
virtual rtl::Reference< Node > getNode() = 0;
virtual bool isFinalized() = 0;
@@ -155,9 +152,7 @@ protected:
virtual ~Access();
virtual rtl::OUString getNameInternal() = 0;
-
virtual rtl::Reference< RootAccess > getRootAccess() = 0;
-
virtual rtl::Reference< Access > getParentAccess() = 0;
virtual void addTypes(std::vector< com::sun::star::uno::Type > * types)
@@ -167,7 +162,6 @@ protected:
std::vector< rtl::OUString > * services) = 0;
virtual void initDisposeBroadcaster(Broadcaster * broadcaster);
-
virtual void clearListeners() throw ();
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
@@ -179,9 +173,7 @@ protected:
void checkLocalizedPropertyAccess();
rtl::Reference< Node > getParentNode();
-
rtl::Reference< ChildAccess > getChild(rtl::OUString const & name);
-
std::vector< rtl::Reference< ChildAccess > > getAllChildren();
void checkValue(
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 977d97e..77fd519 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -77,11 +77,9 @@ public:
rtl::Reference< Node > const & node);
virtual Path getAbsolutePath();
-
virtual Path getRelativePath();
virtual rtl::OUString getRelativePathRepresentation();
-
virtual rtl::Reference< Node > getNode();
virtual bool isFinalized();
@@ -89,11 +87,9 @@ public:
virtual rtl::OUString getNameInternal();
virtual rtl::Reference< RootAccess > getRootAccess();
-
virtual rtl::Reference< Access > getParentAccess();
virtual void SAL_CALL acquire() throw ();
-
virtual void SAL_CALL release() throw ();
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
@@ -119,9 +115,7 @@ public:
void unbind() throw ();
bool isInTransaction() const { return inTransaction_; }
-
void committed();
-
void setNode(rtl::Reference< Node > const & node);
void setProperty(
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index 4f4aece..27eea9c 100644
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -50,30 +50,24 @@ public:
virtual rtl::Reference< Node > clone(bool keepTemplateName) const = 0;
virtual NodeMap & getMembers();
-
virtual rtl::OUString getTemplateName() const;
virtual void setMandatory(int layer);
-
virtual int getMandatory() const;
void setLayer(int layer);
-
int getLayer() const;
void setFinalized(int layer);
-
int getFinalized() const;
rtl::Reference< Node > getMember(rtl::OUString const & name);
protected:
explicit Node(int layer);
-
Node(const Node & other);
virtual ~Node();
-
virtual void clear();
virtual rtl::Reference< Node > findMember(rtl::OUString const & name);
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index c2454e8..5e9e501 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -30,9 +30,7 @@
#define INCLUDED_CONFIGMGR_SOURCE_NODEMAP_HXX
#include "sal/config.h"
-
#include <map>
-
#include "rtl/ref.hxx"
namespace rtl { class OUString; }
diff --git a/configmgr/source/xmlreader.hxx b/configmgr/source/xmlreader.hxx
index 9bb0759..c5436fe 100644
--- a/configmgr/source/xmlreader.hxx
+++ b/configmgr/source/xmlreader.hxx
@@ -80,17 +80,13 @@ public:
private:
inline char read() { return pos_ == end_ ? '\0' : *pos_++; }
-
inline char peek() { return pos_ == end_ ? '\0' : *pos_; }
void normalizeLineEnds(Span const & text);
void skipSpace();
-
bool skipComment();
-
void skipProcessingInstruction();
-
void skipDocumentTypeDeclaration();
Span scanCdataSection();
@@ -105,15 +101,12 @@ private:
char const * begin, char const * end, bool fullyNormalize);
Result handleStartTag(Namespace * ns, Span * localName);
-
Result handleEndTag();
void handleElementEnd();
Result handleSkippedText(Span * data, Namespace * ns);
-
Result handleRawText(Span * text);
-
Result handleNormalizedText(Span * text);
struct NamespaceData {
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 1da8f15..2384919 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
@@ -96,16 +96,13 @@ namespace connectivity
#endif
public:
-
NS_DECL_ISUPPORTS
NS_DECL_NSIABDIRECTORYQUERYRESULTLISTENER
MQueryHelper();
-
virtual ~MQueryHelper();
void reset();
-
void rewind();
MQueryHelperResultEntry* next( );
@@ -115,19 +112,15 @@ namespace connectivity
const ErrorDescriptor& getError() const { return m_aError; }
sal_Bool isError() const;
-
sal_Bool hasMore() const;
-
sal_Bool atEnd() const;
sal_Bool queryComplete() const;
sal_Bool waitForQueryComplete( );
-
sal_Bool waitForRow( sal_Int32 rowNum );
sal_Int32 getResultCount() const;
-
sal_uInt32 getRealCount() const;
sal_Int32 createNewCard(); //return Row count number
sal_Bool resyncRow(sal_Int32 rowIndex);
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index cc8d7ca..63c6d4a 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -36,8 +36,6 @@
#include <ocidl.h>
#include <adoint.h>
#include "ado_post_sys_include.h"
-
-
#include "ado/adoimp.hxx"
#include "ado/Aolewrap.hxx"
#include "ado/Aolevariant.hxx"
@@ -75,53 +73,36 @@ namespace connectivity
WpADOProperties get_Properties() const;
rtl::OUString GetConnectionString() const;
-
sal_Bool PutConnectionString(const ::rtl::OUString &aCon) const;
-
sal_Int32 GetCommandTimeout() const;
-
void PutCommandTimeout(sal_Int32 nRet);
-
sal_Int32 GetConnectionTimeout() const ;
-
void PutConnectionTimeout(sal_Int32 nRet);
sal_Bool Close( ) ;
-
sal_Bool Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset);
-
sal_Bool BeginTrans();
-
sal_Bool CommitTrans( ) ;
-
sal_Bool RollbackTrans( );
-
sal_Bool Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options);
-
sal_Bool GetErrors(ADOErrors** pErrors);
::rtl::OUString GetDefaultDatabase() const;
-
sal_Bool PutDefaultDatabase(const ::rtl::OUString& _bstr);
IsolationLevelEnum get_IsolationLevel() const ;
-
sal_Bool put_IsolationLevel(const IsolationLevelEnum& eNum) ;
sal_Int32 get_Attributes() const;
-
sal_Bool put_Attributes(sal_Int32 nRet);
CursorLocationEnum get_CursorLocation() const;
-
sal_Bool put_CursorLocation(const CursorLocationEnum &eNum) ;
ConnectModeEnum get_Mode() const;
-
sal_Bool put_Mode(const ConnectModeEnum &eNum) ;
::rtl::OUString get_Provider() const;
-
sal_Bool put_Provider(const ::rtl::OUString& _bstr);
sal_Int32 get_State() const;
@@ -223,9 +204,7 @@ namespace connectivity
//////////////////////////////////////////////////////////////////////
::rtl::OUString GetDescription() const;
-
::rtl::OUString GetSource() const ;
-
sal_Int32 GetNumber() const ;
::rtl::OUString GetSQLState() const ;
sal_Int32 GetNativeError() const ;
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index cddfaea..00c4eb5 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -90,13 +90,10 @@ class OleComponent : public ::cppu::WeakImplHelper5< ::com::sun::star::util::XCl
// such objects report the dirty state wrongly sometimes and do not allow to store them any time
sal_Bool m_bWorkaroundActive;
-
sal_Bool InitializeObject_Impl();
void CreateNewIStorage_Impl();
-
void RetrieveObjectDataFlavors_Impl();
-
void Dispose();
@@ -118,32 +115,22 @@ public:
// ==== Initialization ==================================================
void LoadEmbeddedObject( const ::rtl::OUString& aTempURL );
-
void CreateObjectFromClipboard();
-
void CreateNewEmbeddedObject( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeqCLSID );
-
void CreateObjectFromData(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransfer );
-
void CreateObjectFromFile( const ::rtl::OUString& aFileName );
-
void CreateLinkFromFile( const ::rtl::OUString& aFileName );
-
void InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent );
// ======================================================================
-
void RunObject(); // switch OLE object to running state
-
void CloseObject(); // switch OLE object to loaded state
::com::sun::star::uno::Sequence< ::com::sun::star::embed::VerbDescriptor > GetVerbList();
void ExecuteVerb( sal_Int32 nVerbID );
-
void SetHostName( const ::rtl::OUString& aContName, const ::rtl::OUString& aEmbDocName );
-
void SetExtent( const ::com::sun::star::awt::Size& aVisAreaSize, sal_Int64 nAspect );
::com::sun::star::awt::Size GetExtent( sal_Int64 nAspect );
@@ -155,7 +142,6 @@ public:
::com::sun::star::uno::Sequence< sal_Int8 > GetCLSID();
sal_Bool IsWorkaroundActive() { return m_bWorkaroundActive; }
-
sal_Bool IsDirty();
void StoreOwnTmpIfNecessary();
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 120df8c..163dfba 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -32,49 +32,31 @@
//_________________________________________________________________________________________________________________
// my own includes
//_________________________________________________________________________________________________________________
-
#include <threadhelp/threadhelpbase.hxx>
-
#include <threadhelp/resetableguard.hxx>
-
#include <macros/xinterface.hxx>
-
#include <macros/xtypeprovider.hxx>
-
#include <macros/xserviceinfo.hxx>
-
#include <macros/debug.hxx>
-
#include <macros/generic.hxx>
-
#include <general.h>
-
#include <stdtypes.h>
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-
#include <com/sun/star/lang/XTypeProvider.hpp>
-
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
-
#include <com/sun/star/frame/XStatusListener.hpp>
-
#include <com/sun/star/frame/XFrame.hpp>
-
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
-
#include <com/sun/star/beans/PropertyValue.hpp>
-
#include <com/sun/star/util/URL.hpp>
//_________________________________________________________________________________________________________________
// other includes
//_________________________________________________________________________________________________________________
-
#include <cppuhelper/weak.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 282c0ab..e2eb8d0 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -58,27 +58,16 @@
//_______________________________________________
// other includes
#include <vcl/svapp.hxx>
-
#include <com/sun/star/container/XNamed.hpp>
-
#include <com/sun/star/container/XNameContainer.hpp>
-
#include <com/sun/star/awt/KeyEvent.hpp>
-
#include <com/sun/star/awt/KeyModifier.hpp>
-
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
#include <com/sun/star/util/XChangesNotifier.hpp>
-
#include <comphelper/configurationhelper.hxx>
-
#include <unotools/configpathes.hxx>
-
#include <rtl/logfile.hxx>
-
#include <svtools/acceleratorexecute.hxx>
-
#include <stdio.h>
//_______________________________________________
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 6c69423..77f8906 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -28,65 +28,41 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
-
#include <helper/titlebarupdate.hxx>
//_________________________________________________________________________________________________________________
// my own includes
//_________________________________________________________________________________________________________________
-
#include <pattern/window.hxx>
-
#include <threadhelp/writeguard.hxx>
-
#include <threadhelp/readguard.hxx>
-
#include <macros/generic.hxx>
-
#include <services.h>
-
#include <properties.h>
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-
#include <com/sun/star/awt/XWindow.hpp>
-
#include <com/sun/star/lang/XServiceInfo.hpp>
-
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-
#include <com/sun/star/frame/XModuleManager.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <com/sun/star/beans/XMaterialHolder.hpp>
-
#include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-
#include <com/sun/star/beans/NamedValue.hpp>
//_________________________________________________________________________________________________________________
// other includes
//_________________________________________________________________________________________________________________
-
#include <comphelper/sequenceashashmap.hxx>
-
#include <unotools/configmgr.hxx>
-
#include <unotools/bootstrap.hxx>
-
#include <vcl/window.hxx>
-
#include <vcl/syswin.hxx>
-
#include <toolkit/unohlp.hxx>
-
#include <vcl/svapp.hxx>
-
#include <vcl/wrkwin.hxx>
//_________________________________________________________________________________________________________________
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 56bf5c6..3e82c68 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sfx2.hxx"
// include ---------------------------------------------------------------
-
#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <svl/eitem.hxx>
@@ -85,9 +84,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
nFlags ( pStyle->GetMask() )
/* [Beschreibung]
-
Konstruktor; initialisiert die ListBoxen mit den Vorlagen
-
*/
{
@@ -269,9 +266,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
/* [Beschreibung]
-
Destruktor; Freigabe der Daten
-
*/
{
@@ -289,16 +284,13 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
const String& rNew )
/* [Beschreibung]
-
Nach der "Anderung eines Vorlagennamens die ListBox pBox
aktualisieren
[Parameter]
-
ListBox* pBox ListBox, deren Eintr"age aktualisiert
werden sollen
const String& rNew der neue Name
-
*/
{
@@ -319,7 +311,6 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
void SfxManageStyleSheetPage::SetDescriptionText_Impl()
/* [Beschreibung]
-
Attributbeschreibung setzen. daf"ur die eingestellte Metrik besorgen.
*/
@@ -338,14 +329,11 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
switch ( eFieldUnit )
{
case FUNIT_MM: eUnit = SFX_MAPUNIT_MM; break;
-
case FUNIT_CM:
case FUNIT_M:
case FUNIT_KM: eUnit = SFX_MAPUNIT_CM; break;
-
case FUNIT_POINT:
case FUNIT_PICA: eUnit = SFX_MAPUNIT_POINT; break;
-
case FUNIT_INCH:
case FUNIT_FOOT:
case FUNIT_MILE: eUnit = SFX_MAPUNIT_INCH; break;
@@ -361,9 +349,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
/* [Beschreibung]
-
StarView Handler; GetFocus-Handler des Edits mit dem Vorlagennamen.
-
*/
{
@@ -400,27 +386,20 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
/* [Beschreibung]
-
-
Handler f"ur das Setzen der (modifizierten) Daten. Wird aus
dem Ok des SfxTabDialog gerufen.
[Parameter]
-
SfxItemSet &rAttrSet das Set, das die Daten entgegennimmt.
-
[R"uckgabewert]
-
BOOL TRUE: es hat eine "Anderung der Daten
stattgefunden
FALSE: es hat keine "Anderung der Daten
stattgefunden
[Querverweise]
-
<class SfxTabDialog>
-
*/
{
@@ -456,19 +435,13 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
/* [Beschreibung]
-
-
Handler f"ur das Initialisieren der Seite mit den initialen Daten.
[Parameter]
-
const SfxItemSet &rAttrSet das Set mit den Daten
-
[Querverweise]
-
<class SfxTabDialog>
-
*/
{
@@ -528,12 +501,9 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent,
const SfxItemSet &rAttrSet )
/* [Beschreibung]
-
-
Factory f"ur das Erzeugen der Seite
[Querverweise]
-
<class SfxTabDialog>
*/
@@ -547,20 +517,16 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent,
void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
/* [Beschreibung]
-
ActivatePage- Handler des SfxTabDialog; wird f"ur die Aktualisierung
des beschreibenden Textes verwendet, da sich dieser durch "Anderungen
der Daten anderer Seiten ge"andert haben kann.
[Parameter]
-
const SfxItemSet& das Set f"ur den Datenaustausch; wird
hier nicht verwendet.
[Querverweise]
-
<SfxTabDialog::ActivatePage(const SfxItemSet &)>
-
*/
{
@@ -580,20 +546,16 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
/* [Beschreibung]
-
DeactivatePage- Handler des SfxTabDialog; die Daten werden
an der Vorlage eingestellt, damit die richtige Vererbung
f"ur die anderen Seiten des Dialoges vorliegt.
Im Fehlerfall wird das Verlassen der Seite unterbunden.
[Parameter]
-
SfxItemSet* das Set f"ur den Datenaustausch; wird hier nicht verwendet.
[Querverweise]
-
<SfxTabDialog::DeactivatePage(SfxItemSet*)>
-
*/
{
diff --git a/shell/inc/internal/dbgmacros.hxx b/shell/inc/internal/dbgmacros.hxx
index eba501d..b9d0795 100644
--- a/shell/inc/internal/dbgmacros.hxx
+++ b/shell/inc/internal/dbgmacros.hxx
@@ -32,21 +32,13 @@
void DbgAssert(bool condition, const char* message);
#if OSL_DEBUG_LEVEL > 0
-
#define PRE_CONDITION(x, msg) DbgAssert(x, msg)
-
#define POST_CONDITION(x, msg) DbgAssert(x, msg)
-
#define ENSURE(x ,msg) DbgAssert(x, msg)
-
#else // OSL_DEBUG_LEVEL == 0
-
#define PRE_CONDITION(x, msg) ((void)0)
-
#define POST_CONDITION(x, msg) ((void)0)
-
#define ENSURE(x, msg) ((void)0)
-
#endif
#endif
commit 723328ae4dc93a9dacf8df0e6bc66b9cbd2c78aa
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 00:38:30 2011 +0100
Make this file readable.
diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/classes/sfxhelperfunctions.hxx
index aa8071c..d0a1d0d 100644
--- a/framework/inc/classes/sfxhelperfunctions.hxx
+++ b/framework/inc/classes/sfxhelperfunctions.hxx
@@ -36,39 +36,68 @@
#include <svtools/toolboxcontroller.hxx>
#include <svtools/statusbarcontroller.hxx>
-typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
-typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL );
-typedef void ( *pfunc_getRefreshToolbars)( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-typedef void ( *pfunc_createDockingWindow)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
-typedef bool ( *pfunc_isDockingWindowVisible)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
-typedef void ( *pfunc_activateToolPanel)( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ ToolBox* pToolbox,
+ unsigned short nID,
+ const ::rtl::OUString& aCommandURL );
+
+typedef svt::StatusbarController* ( *pfunc_setStatusBarControllerCreator)(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ StatusBar* pStatusBar,
+ unsigned short nID,
+ const ::rtl::OUString& aCommandURL );
+
+typedef void ( *pfunc_getRefreshToolbars)(
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+
+typedef void ( *pfunc_createDockingWindow)(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& rResourceURL );
+
+typedef bool ( *pfunc_isDockingWindowVisible)(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& rResourceURL );
+
+typedef void ( *pfunc_activateToolPanel)(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+ const ::rtl::OUString& i_rPanelURL );
+
namespace framework
{
-
pfunc_setToolBoxControllerCreator SAL_CALL SetToolBoxControllerCreator( pfunc_setToolBoxControllerCreator pSetToolBoxControllerCreator );
-
-svt::ToolboxController* SAL_CALL CreateToolBoxController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL );
+svt::ToolboxController* SAL_CALL CreateToolBoxController(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ ToolBox* pToolbox,
+ unsigned short nID,
+ const ::rtl::OUString& aCommandURL );
pfunc_setStatusBarControllerCreator SAL_CALL SetStatusBarControllerCreator( pfunc_setStatusBarControllerCreator pSetStatusBarControllerCreator );
-
-svt::StatusbarController* SAL_CALL CreateStatusBarController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, const ::rtl::OUString& aCommandURL );
+svt::StatusbarController* SAL_CALL CreateStatusBarController(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ StatusBar* pStatusBar,
+ unsigned short nID,
+ const ::rtl::OUString& aCommandURL );
pfunc_getRefreshToolbars SAL_CALL SetRefreshToolbars( pfunc_getRefreshToolbars pRefreshToolbarsFunc );
-
-void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+void SAL_CALL RefreshToolbars(
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
pfunc_createDockingWindow SAL_CALL SetDockingWindowCreator( pfunc_createDockingWindow pCreateDockingWindow );
-
-void SAL_CALL CreateDockingWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+void SAL_CALL CreateDockingWindow(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& rResourceURL );
pfunc_isDockingWindowVisible SAL_CALL SetIsDockingWindowVisible( pfunc_isDockingWindowVisible pIsDockingWindowVisible );
-
-bool SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const ::rtl::OUString& rResourceURL );
+bool SAL_CALL IsDockingWindowVisible(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const ::rtl::OUString& rResourceURL );
pfunc_activateToolPanel SAL_CALL SetActivateToolPanel( pfunc_activateToolPanel i_pActivator );
-
-void SAL_CALL ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL );
+void SAL_CALL ActivateToolPanel(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+ const ::rtl::OUString& i_rPanelURL );
}
#endif // __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_
More information about the Libreoffice-commits
mailing list