summaryrefslogtreecommitdiff
path: root/svx/source/gallery2
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/gallery2')
-rw-r--r--svx/source/gallery2/codec.cxx6
-rw-r--r--svx/source/gallery2/galbrws.cxx15
-rw-r--r--svx/source/gallery2/galbrws1.cxx38
-rw-r--r--svx/source/gallery2/galbrws1.hxx2
-rw-r--r--svx/source/gallery2/galbrws2.cxx20
-rw-r--r--svx/source/gallery2/galctrl.cxx18
-rw-r--r--svx/source/gallery2/gallery1.cxx32
-rw-r--r--svx/source/gallery2/galmisc.cxx10
-rw-r--r--svx/source/gallery2/galobj.cxx12
-rw-r--r--svx/source/gallery2/galtheme.cxx20
-rw-r--r--svx/source/gallery2/galtheme.src8
11 files changed, 135 insertions, 46 deletions
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 3306e7896c5d..e995e1937d9c 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -31,20 +31,26 @@
#include <tools/stream.hxx>
#include <tools/zcodec.hxx>
#include "codec.hxx"
+#include <tools/debug.hxx>
// ----------------
// - GalleryCodec -
// ----------------
+DBG_NAME(GalleryCodec)
GalleryCodec::GalleryCodec( SvStream& rIOStm ) :
rStm( rIOStm )
{
+ DBG_CTOR(GalleryCodec,NULL);
+
}
// -----------------------------------------------------------------------------
GalleryCodec::~GalleryCodec()
{
+
+ DBG_DTOR(GalleryCodec,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 5d4e4297f0a4..5cd82383e9d5 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -57,16 +57,21 @@ public:
};
// -----------------------------------------------------------------------------
+DBG_NAME(GallerySplitter)
GallerySplitter::GallerySplitter( Window* pParent, const ResId& rResId ) :
Splitter( pParent, rResId )
{
+ DBG_CTOR(GallerySplitter,NULL);
+
}
// -----------------------------------------------------------------------------
GallerySplitter::~GallerySplitter()
{
+
+ DBG_DTOR(GallerySplitter,NULL);
}
// -----------------------------------------------------------------------------
@@ -80,10 +85,13 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
// -------------------------
// - SvxGalleryChildWindow -
// -------------------------
+DBG_NAME(GalleryChildWindow)
GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
+ DBG_CTOR(GalleryChildWindow,NULL);
+
pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) );
eChildAlignment = SFX_ALIGN_TOP;
( (GalleryBrowser*) pWindow )->Initialize( pInfo );
@@ -93,6 +101,8 @@ GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBin
GalleryChildWindow::~GalleryChildWindow()
{
+
+ DBG_DTOR(GalleryChildWindow,NULL);
}
// -----------------------------------------------------------------------------
@@ -102,11 +112,14 @@ SFX_IMPL_DOCKINGWINDOW( GalleryChildWindow, SID_GALLERY )
// ------------------
// - GalleryBrowser -
// ------------------
+DBG_NAME(GalleryBrowser)
GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW,
Window* pParent, const ResId& rResId ) :
SfxDockingWindow( _pBindings, pCW, pParent, rResId )
{
+ DBG_CTOR(GalleryBrowser,NULL);
+
mpGallery = Gallery::GetGalleryInstance();
mpBrowser1 = new GalleryBrowser1( this, GAL_RESID( GALLERY_BROWSER1 ), mpGallery );
mpSplitter = new GallerySplitter( this, GAL_RESID( GALLERY_SPLITTER ) );
@@ -132,6 +145,8 @@ GalleryBrowser::~GalleryBrowser()
delete mpBrowser2;
delete mpSplitter;
delete mpBrowser1;
+
+ DBG_DTOR(GalleryBrowser,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 3704262833ed..0836be979866 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -57,16 +57,21 @@ using namespace ::com::sun::star;
// -----------------
// - GalleryButton -
// -----------------
+DBG_NAME(GalleryButton)
GalleryButton::GalleryButton( GalleryBrowser1* pParent, WinBits nWinBits ) :
PushButton( pParent, nWinBits )
{
+ DBG_CTOR(GalleryButton,NULL);
+
}
// -----------------------------------------------------------------------------
GalleryButton::~GalleryButton()
{
+
+ DBG_DTOR(GalleryButton,NULL);
}
// -----------------------------------------------------------------------------
@@ -80,10 +85,13 @@ void GalleryButton::KeyInput( const KeyEvent& rKEvt )
// -----------------------
// - GalleryThemeListBox -
// -----------------------
+DBG_NAME(GalleryThemeListBox)
GalleryThemeListBox::GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWinBits ) :
ListBox( pParent, nWinBits )
{
+ DBG_CTOR(GalleryThemeListBox,NULL);
+
InitSettings();
}
@@ -91,6 +99,8 @@ GalleryThemeListBox::GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWin
GalleryThemeListBox::~GalleryThemeListBox()
{
+
+ DBG_DTOR(GalleryThemeListBox,NULL);
}
// ------------------------------------------------------------------------
@@ -139,6 +149,7 @@ long GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt )
// -------------------
// - GalleryBrowser1 -
// -------------------
+DBG_NAME(GalleryBrowser1)
GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, Gallery* pGallery ) :
Control ( pParent, rResId ),
@@ -152,6 +163,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
aImgReadOnly ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_READONLY ) ),
aImgImported ( GalleryResGetBitmapEx( RID_SVXBMP_THEME_IMPORTED ) )
{
+ DBG_CTOR(GalleryBrowser1,NULL);
+
StartListening( *mpGallery );
maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME );
@@ -183,6 +196,8 @@ GalleryBrowser1::~GalleryBrowser1()
mpThemes = NULL;
delete mpExchangeData;
mpExchangeData = NULL;
+
+ DBG_DTOR(GalleryBrowser1,NULL);
}
// -----------------------------------------------------------------------------
@@ -258,9 +273,8 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
// -----------------------------------------------------------------------------
-::std::vector< sal_uInt16 > GalleryBrowser1::ImplGetExecuteVector()
+void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
{
- ::std::vector< sal_uInt16 > aExecVector;
GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
if( pTheme )
@@ -284,23 +298,21 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_True;
if( bUpdateAllowed && pTheme->GetObjectCount() )
- aExecVector.push_back( MN_ACTUALIZE );
+ o_aExec.push_back( MN_ACTUALIZE );
if( bRenameAllowed )
- aExecVector.push_back( MN_RENAME );
+ o_aExec.push_back( MN_RENAME );
if( bRemoveAllowed )
- aExecVector.push_back( MN_DELETE );
+ o_aExec.push_back( MN_DELETE );
if( bIdDialog && !pTheme->IsReadOnly() && !pTheme->IsImported() )
- aExecVector.push_back( MN_ASSIGN_ID );
+ o_aExec.push_back( MN_ASSIGN_ID );
- aExecVector.push_back( MN_PROPERTIES );
+ o_aExec.push_back( MN_PROPERTIES );
mpGallery->ReleaseTheme( pTheme, *this );
}
-
- return aExecVector;
}
// -----------------------------------------------------------------------------
@@ -587,7 +599,8 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( !bRet )
{
- ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
+ ::std::vector< sal_uInt16 > aExecVector;
+ ImplGetExecuteVector(aExecVector);
sal_uInt16 nExecuteId = 0;
sal_Bool bMod1 = rKEvt.GetKeyCode().IsMod1();
@@ -651,9 +664,10 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG )
{
- ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
+ ::std::vector< sal_uInt16 > aExecVector;
+ ImplGetExecuteVector(aExecVector);
- if( aExecVector.size() )
+ if( !aExecVector.empty() )
{
PopupMenu aMenu( GAL_RESID( RID_SVXMN_GALLERY1 ) );
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index d05187d4c856..d6078a205042 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -101,7 +101,7 @@ private:
void ImplAdjustControls();
sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
- ::std::vector< sal_uInt16 > ImplGetExecuteVector();
+ void ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec);
void ImplExecute( sal_uInt16 nId );
void ImplGalleryThemeProperties( const String & rThemeName, bool bCreateNew );
void ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog, bool bCreateNew );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 2fff76ba0c76..681ce3335df1 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -92,12 +92,15 @@ public:
};
// ------------------------------------------------------------------------
+DBG_NAME(GalleryBackgroundPopup)
GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ) :
SfxControllerItem ( SID_GALLERY_BG_BRUSH, SfxViewFrame::Current()->GetBindings() ),
mpTheme ( pTheme ),
mnObjectPos ( nObjectPos )
{
+ DBG_CTOR(GalleryBackgroundPopup,NULL);
+
SfxViewFrame::Current()->GetBindings().Update( SID_GALLERY_BG_BRUSH );
RemoveDisabledEntries();
}
@@ -106,6 +109,8 @@ GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_
GalleryBackgroundPopup::~GalleryBackgroundPopup()
{
+
+ DBG_DTOR(GalleryBackgroundPopup,NULL);
}
// ------------------------------------------------------------------------
@@ -172,6 +177,7 @@ public:
};
// ------------------------------------------------------------------------
+DBG_NAME(GalleryThemePopup)
GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) :
PopupMenu ( GAL_RESID( RID_SVXMN_GALLERY2 ) ),
@@ -181,6 +187,8 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nO
mnObjectPos ( nObjectPos ),
mbPreview ( bPreview )
{
+ DBG_CTOR(GalleryThemePopup,NULL);
+
const SgaObjKind eObjKind = mpTheme->GetObjectKind( mnObjectPos );
PopupMenu* pAddMenu = GetPopupMenu( MN_ADDMENU );
SfxBindings& rBindings = SfxViewFrame::Current()->GetBindings();
@@ -259,6 +267,8 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nO
GalleryThemePopup::~GalleryThemePopup()
{
+
+ DBG_DTOR(GalleryThemePopup,NULL);
}
// ------------------------------------------------------------------------
@@ -279,16 +289,21 @@ void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons
// ------------------
// - GalleryToolBox -
// ------------------
+DBG_NAME(GalleryToolBox)
GalleryToolBox::GalleryToolBox( GalleryBrowser2* pParent ) :
ToolBox( pParent, WB_TABSTOP )
{
+ DBG_CTOR(GalleryToolBox,NULL);
+
}
// ------------------------------------------------------------------------
GalleryToolBox::~GalleryToolBox()
{
+
+ DBG_DTOR(GalleryToolBox,NULL);
}
// ------------------------------------------------------------------------
@@ -302,6 +317,7 @@ void GalleryToolBox::KeyInput( const KeyEvent& rKEvt )
// -------------------
// - GalleryBrowser2 -
// -------------------
+DBG_NAME(GalleryBrowser2)
GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, Gallery* pGallery ) :
Control ( pParent, rResId ),
@@ -318,6 +334,8 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
meLastMode ( GALLERYBROWSERMODE_NONE ),
mbCurActionIsLinkage( sal_False )
{
+ DBG_CTOR(GalleryBrowser2,NULL);
+
Image aDummyImage;
const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
Font aInfoFont( maInfoBar.GetControlFont() );
@@ -371,6 +389,8 @@ GalleryBrowser2::~GalleryBrowser2()
if( mpCurTheme )
mpGallery->ReleaseTheme( mpCurTheme, *this );
+
+ DBG_DTOR(GalleryBrowser2,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 6dca7b050e01..9e2ea4abaf92 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -54,6 +54,7 @@
// ------------------
// - GalleryPreview -
// ------------------
+DBG_NAME(GalleryPreview)
GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
Window( pParent, WB_TABSTOP | WB_BORDER ),
@@ -61,6 +62,8 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme )
DragSourceHelper( this ),
mpTheme( pTheme )
{
+ DBG_CTOR(GalleryPreview,NULL);
+
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
}
@@ -73,6 +76,8 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) :
DragSourceHelper( this ),
mpTheme( NULL )
{
+ DBG_CTOR(GalleryPreview,NULL);
+
SetHelpId( HID_GALLERY_PREVIEW );
InitSettings();
}
@@ -81,6 +86,8 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) :
GalleryPreview::~GalleryPreview()
{
+
+ DBG_DTOR(GalleryPreview,NULL);
}
@@ -300,6 +307,7 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
// -------------------
// - GalleryIconView -
// -------------------
+DBG_NAME(GalleryIconView)
GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
ValueSet( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_VSCROLL | WB_FLATVALUESET ),
@@ -307,6 +315,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
DragSourceHelper( this ),
mpTheme ( pTheme )
{
+ DBG_CTOR(GalleryIconView,NULL);
EnableFullItemMode( sal_False );
SetHelpId( HID_GALLERY_WINDOW );
@@ -320,6 +329,8 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
GalleryIconView::~GalleryIconView()
{
+
+ DBG_DTOR(GalleryIconView,NULL);
}
// ------------------------------------------------------------------------
@@ -402,7 +413,7 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt )
aGraphic.Draw( pDev, aPos, aSize );
}
- SetItemText( nId, GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_THEMENAME | GALLERY_ITEM_TITLE | GALLERY_ITEM_PATH ) );
+ SetItemText( nId, GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_TITLE) );
mpTheme->ReleaseObject( pObj );
}
}
@@ -468,6 +479,7 @@ void GalleryIconView::StartDrag( sal_Int8, const Point& )
// -------------------
// - GalleryListView -
// -------------------
+DBG_NAME(GalleryListView)
GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ),
@@ -475,6 +487,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
mnCurRow( 0 ),
mbInit( sal_False )
{
+ DBG_CTOR(GalleryListView,NULL);
+
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
@@ -489,6 +503,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
GalleryListView::~GalleryListView()
{
+
+ DBG_DTOR(GalleryListView,NULL);
}
// ------------------------------------------------------------------------
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index eee9f46953c4..f8e5dd5f24fa 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -175,6 +175,8 @@ SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry )
// - GalleryThemeCacheEntry -
// --------------------------
+class GalleryThemeCacheEntry;
+DBG_NAME(GalleryThemeCacheEntry)
class GalleryThemeCacheEntry
{
private:
@@ -185,8 +187,8 @@ private:
public:
GalleryThemeCacheEntry( const GalleryThemeEntry* pThemeEntry, GalleryTheme* pTheme ) :
- mpThemeEntry( pThemeEntry ), mpTheme( pTheme ) {}
- ~GalleryThemeCacheEntry() { delete mpTheme; }
+ mpThemeEntry( pThemeEntry ), mpTheme( pTheme ) {DBG_CTOR(GalleryThemeCacheEntry,NULL);}
+ ~GalleryThemeCacheEntry() { delete mpTheme;DBG_DTOR(GalleryThemeCacheEntry,NULL); }
const GalleryThemeEntry* GetThemeEntry() const { return mpThemeEntry; }
GalleryTheme* GetTheme() const { return mpTheme; }
@@ -195,7 +197,6 @@ public:
// -----------
// - Gallery -
// -----------
-
Gallery::Gallery( const String& rMultiPath )
: nReadTextEncoding ( gsl_getSystemTextEncoding() )
, nLastFileNumber ( 0 )
@@ -327,16 +328,20 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
if( xContentAccess.is() )
{
+ static const ::rtl::OUString s_sTitle(RTL_CONSTASCII_USTRINGPARAM("Title"));
+ static const ::rtl::OUString s_sIsReadOnly(RTL_CONSTASCII_USTRINGPARAM("IsReadOnly"));
+ static const ::rtl::OUString s_sSDG_EXT(RTL_CONSTASCII_USTRINGPARAM("sdg"));
+ static const ::rtl::OUString s_sSDV_EXT(RTL_CONSTASCII_USTRINGPARAM("sdv"));
+
while( xResultSet->next() )
{
INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() );
if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAscii("thm"))
{
- INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( OUString::createFromAscii( "sdg" ) );
- INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString::createFromAscii( "sdv" ) );
- const OUString aTitleProp( OUString::createFromAscii( "Title" ) );
- const OUString aReadOnlyProp( OUString::createFromAscii( "IsReadOnly" ) );
+ INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( s_sSDG_EXT );
+ INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( s_sSDV_EXT );
+
OUString aTitle;
sal_Bool bReadOnly = sal_False;
@@ -348,7 +353,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
try
{
- aThmCnt.getPropertyValue( aTitleProp ) >>= aTitle;
+ aThmCnt.getPropertyValue( s_sTitle ) >>= aTitle;
}
catch( const uno::RuntimeException& )
{
@@ -361,7 +366,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
try
{
- aThmCnt.getPropertyValue( aReadOnlyProp ) >>= bReadOnly;
+ aThmCnt.getPropertyValue( s_sIsReadOnly ) >>= bReadOnly;
}
catch( const uno::RuntimeException& )
{
@@ -374,7 +379,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
try
{
- aSdgCnt.getPropertyValue( aTitleProp ) >>= aTitle;
+ aSdgCnt.getPropertyValue( s_sTitle ) >>= aTitle;
}
catch( const ::com::sun::star::uno::RuntimeException& )
{
@@ -387,7 +392,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
try
{
- aSdgCnt.getPropertyValue( aReadOnlyProp ) >>= bReadOnly;
+ aSdgCnt.getPropertyValue( s_sIsReadOnly ) >>= bReadOnly;
}
catch( const uno::RuntimeException& )
{
@@ -402,7 +407,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
try
{
- aSdvCnt.getPropertyValue( aTitleProp ) >>= aTitle;
+ aSdvCnt.getPropertyValue( s_sTitle ) >>= aTitle;
}
catch( const ::com::sun::star::uno::RuntimeException& )
{
@@ -415,7 +420,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
{
try
{
- aSdvCnt.getPropertyValue( aReadOnlyProp ) >>= bReadOnly;
+ aSdvCnt.getPropertyValue( s_sIsReadOnly ) >>= bReadOnly;
}
catch( const uno::RuntimeException& )
{
@@ -594,7 +599,6 @@ String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
case( GALLERY_THEME_3D ): aFallback = "3D"; break;
case( GALLERY_THEME_BULLETS ): aFallback = "Bullets"; break;
case( GALLERY_THEME_HOMEPAGE ): aFallback = "Homepage"; break;
- case( GALLERY_THEME_HTMLBUTTONS ): aFallback = "private://gallery/hidden/HtmlExportButtons"; break;
case( GALLERY_THEME_POWERPOINT ): aFallback = "private://gallery/hidden/imgppt"; break;
case( GALLERY_THEME_FONTWORK ): aFallback = "private://gallery/hidden/fontwork"; break;
case( GALLERY_THEME_FONTWORK_VERTICAL ): aFallback = "private://gallery/hidden/fontworkvertical"; break;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index da5375423b56..e9cad0b9e561 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -399,10 +399,13 @@ sal_Bool KillFile( const INetURLObject& rURL )
// -------------------
// - GalleryProgress -
// -------------------
+DBG_NAME(GalleryProgress)
GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
mpFilter( pFilter )
{
+ DBG_CTOR(GalleryProgress,NULL);
+
uno::Reference< lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
if( xMgr.is() )
@@ -442,6 +445,8 @@ GalleryProgress::~GalleryProgress()
{
// if( mpFilter )
// mpFilter->SetUpdatePercentHdl( Link() );
+
+ DBG_DTOR(GalleryProgress,NULL);
}
// ------------------------------------------------------------------------
@@ -455,6 +460,7 @@ void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
// -----------------------
// - GalleryTransferable -
// -----------------------
+DBG_NAME(GalleryTransferable)
GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
mpTheme( pTheme ),
@@ -464,6 +470,8 @@ GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObj
mpImageMap( NULL ),
mpURL( NULL )
{
+ DBG_CTOR(GalleryTransferable,NULL);
+
InitData( bLazy );
}
@@ -471,6 +479,8 @@ GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObj
GalleryTransferable::~GalleryTransferable()
{
+
+ DBG_DTOR(GalleryTransferable,NULL);
}
// ------------------------------------------------------------------------
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 9ba9cff068a3..ff870974d776 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -320,10 +320,13 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
// ------------------
// - SgaObjectSound -
// ------------------
+DBG_NAME(SgaObjectSound)
SgaObjectSound::SgaObjectSound() :
eSoundType( SOUND_STANDARD )
{
+ DBG_CTOR(SgaObjectSound,NULL);
+
}
// ------------------------------------------------------------------------
@@ -331,6 +334,8 @@ SgaObjectSound::SgaObjectSound() :
SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
eSoundType( SOUND_STANDARD )
{
+ DBG_CTOR(SgaObjectSound,NULL);
+
if( FileExists( rURL ) )
{
aURL = rURL;
@@ -345,6 +350,8 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
SgaObjectSound::~SgaObjectSound()
{
+
+ DBG_DTOR(SgaObjectSound,NULL);
}
// ------------------------------------------------------------------------
@@ -453,10 +460,13 @@ SgaObjectSvDraw::SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject
}
// ------------------------------------------------------------------------
+DBG_NAME(SvxGalleryDrawModel)
SvxGalleryDrawModel::SvxGalleryDrawModel()
: mpFormModel( 0 )
{
+ DBG_CTOR(SvxGalleryDrawModel,NULL);
+
const String sFactoryURL(RTL_CONSTASCII_USTRINGPARAM("sdraw"));
mxDoc = SfxObjectShell::CreateObjectByFactoryName( sFactoryURL );
@@ -484,6 +494,8 @@ SvxGalleryDrawModel::~SvxGalleryDrawModel()
{
if( mxDoc.Is() )
mxDoc->DoClose();
+
+ DBG_DTOR(SvxGalleryDrawModel,NULL);
}
// ------------------------------------------------------------------------
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 71f2252fc731..196b35189c03 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -72,6 +72,7 @@ using namespace ::com::sun::star;
// ------------
// - SgaTheme -
// ------------
+DBG_NAME(GalleryTheme)
GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) :
pParent ( pGallery ),
@@ -81,6 +82,8 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
nDragPos ( 0 ),
bDragging ( sal_False )
{
+ DBG_CTOR(GalleryTheme,NULL);
+
ImplCreateSvDrawStorage();
if( pThm->IsImported() )
@@ -99,6 +102,8 @@ GalleryTheme::~GalleryTheme()
delete pEntry;
Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
}
+
+ DBG_DTOR(GalleryTheme,NULL);
}
// ------------------------------------------------------------------------
@@ -1188,18 +1193,13 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s
uno::Sequence< OUString > aProps( 1 );
aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" );
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
-
- if( xResultSet.is() )
+ uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
+ if( xContentAccess.is() )
{
- uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
-
- if( xContentAccess.is() )
+ while( xResultSet->next() )
{
- while( xResultSet->next() )
- {
- aURL.SetSmartURL( xContentAccess->queryContentIdentifierString() );
- aURLVector.push_back( aURL );
- }
+ aURL.SetSmartURL( xContentAccess->queryContentIdentifierString() );
+ aURLVector.push_back( aURL );
}
}
}
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index bfb1f65d0340..0c1771cac440 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -127,14 +127,6 @@ String RID_GALLERYSTR_THEME_SURFACES
// -----------------------------------------------------------------------------
-String RID_GALLERYSTR_THEME_HTMLBUTTONS
-{
- // !!! Don't translate, please !!!
- Text = "private://gallery/hidden/HtmlExportButtons";
-};
-
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_POWERPOINT
{
// !!! Don't translate, please !!!
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 00:15:12 +0000