[Libreoffice-commits] core.git: svx/source
Matthias Freund
matti_lx at yahoo.de
Sat Sep 7 19:58:39 PDT 2013
svx/source/gallery2/GalleryControl.cxx | 20 --
svx/source/gallery2/GallerySplitter.cxx | 6
svx/source/gallery2/codec.cxx | 17 -
svx/source/gallery2/codec.hxx | 4
svx/source/gallery2/galbrws.cxx | 26 --
svx/source/gallery2/galbrws1.cxx | 60 ------
svx/source/gallery2/galbrws1.hxx | 6
svx/source/gallery2/galexpl.cxx | 32 ---
svx/source/gallery2/gallery.src | 10 -
svx/source/gallery2/gallery1.cxx | 46 -----
svx/source/gallery2/galmisc.cxx | 72 --------
svx/source/gallery2/galobj.cxx | 76 --------
svx/source/gallery2/galtheme.cxx | 117 ++-----------
svx/source/gallery2/galtheme.src | 287 --------------------------------
14 files changed, 28 insertions(+), 751 deletions(-)
New commits:
commit 8848c6ec29919deec2f242ccdd336bc710da6646
Author: Matthias Freund <matti_lx at yahoo.de>
Date: Sun Sep 8 00:10:20 2013 +0200
fdo#39468 Comment translation GER-ENG in svx/source/gallery2/
Translate some german comments and remove ascii art. :-)
Change-Id: Ie0ba349b95e4f73aea7b6e20ed3fc86ded14c444
Reviewed-on: https://gerrit.libreoffice.org/5870
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index bb1090c..3806bcb 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -34,7 +34,6 @@ namespace svx { namespace sidebar {
static const sal_Int32 gnInitialVerticalSplitPosition (150);
-
GalleryControl::GalleryControl (
SfxBindings* /*pBindings*/,
Window* pParentWindow)
@@ -68,16 +67,10 @@ GalleryControl::GalleryControl (
InitSettings();
}
-
-
-
GalleryControl::~GalleryControl (void)
{
}
-
-
-
void GalleryControl::InitSettings (void)
{
SetBackground( Wallpaper( GALLERY_DLG_COLOR ) );
@@ -102,9 +95,6 @@ void GalleryControl::InitSettings (void)
mpBrowser2->SetBackground(aBackground);
}
-
-
-
void GalleryControl::Resize (void)
{
// call parent
@@ -180,9 +170,6 @@ void GalleryControl::Resize (void)
maLastSize = aNewSize;
}
-
-
-
sal_Bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* )
{
const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
@@ -218,24 +205,17 @@ sal_Bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* )
return bRet;
}
-
-
-
void GalleryControl::GetFocus (void)
{
Window::GetFocus();
mpBrowser1->GrabFocus();
}
-
-
-
void GalleryControl::ThemeSelectionHasChanged (void)
{
mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme());
}
-
IMPL_LINK( GalleryControl, SplitHdl, void*, EMPTYARG )
{
if(mpSplitter->IsHorizontal())
diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx
index eb8d2c0..a620f87 100644
--- a/svx/source/gallery2/GallerySplitter.cxx
+++ b/svx/source/gallery2/GallerySplitter.cxx
@@ -31,17 +31,11 @@ GallerySplitter::GallerySplitter(
DBG_CTOR(GallerySplitter,NULL);
}
-
-
-
GallerySplitter::~GallerySplitter()
{
DBG_DTOR(GallerySplitter,NULL);
}
-
-
-
void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
{
Splitter::DataChanged( rDCEvt );
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 85bd091..0643df2 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -23,9 +23,8 @@
#include <tools/debug.hxx>
#include "codec.hxx"
-// ----------------
// - GalleryCodec -
-// ----------------
+
DBG_NAME(GalleryCodec)
GalleryCodec::GalleryCodec( SvStream& rIOStm ) :
@@ -34,15 +33,11 @@ GalleryCodec::GalleryCodec( SvStream& rIOStm ) :
DBG_CTOR(GalleryCodec,NULL);
}
-// -----------------------------------------------------------------------------
-
GalleryCodec::~GalleryCodec()
{
DBG_DTOR(GalleryCodec,NULL);
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
{
const sal_uIntPtr nPos = rStm.Tell();
@@ -67,8 +62,6 @@ sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
return bRet;
}
-// -----------------------------------------------------------------------------
-
void GalleryCodec::Write( SvStream& rStmToWrite )
{
sal_uInt32 nPos, nCompSize;
@@ -94,8 +87,6 @@ void GalleryCodec::Write( SvStream& rStmToWrite )
rStm.Seek( STREAM_SEEK_TO_END );
}
-// -----------------------------------------------------------------------------
-
void GalleryCodec::Read( SvStream& rStmToRead )
{
sal_uInt32 nVersion = 0;
@@ -128,16 +119,16 @@ void GalleryCodec::Read( SvStream& rStmToRead )
if ( nRunByte > 2 )
{
- // absolutes Fuellen
+ // filling absolutely
memcpy( &pTmpBuf[ nIndex ], pInBuf, nRunByte );
pInBuf += nRunByte;
nIndex += nRunByte;
- // WORD-Alignment beachten
+ // note WORD alignment
if ( nRunByte & 1 )
pInBuf++;
}
- else if ( nRunByte == 1 ) // Ende des Bildes
+ else if ( nRunByte == 1 ) // End of the image
bEndDecoding = sal_True;
}
else
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index b7620a3..42417dd 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -19,10 +19,6 @@
#include <sal/types.h>
-// ----------------
-// - GalleryCodec -
-// ----------------
-
class SvStream;
class GalleryCodec
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 85647f4..3b717d7 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -32,9 +32,6 @@
#include <boost/bind.hpp>
-// -------------------------
-// - SvxGalleryChildWindow -
-// -------------------------
DBG_NAME(GalleryChildWindow)
GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
@@ -47,20 +44,15 @@ GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBin
( (GalleryBrowser*) pWindow )->Initialize( pInfo );
};
-// -----------------------------------------------------------------------------
-
GalleryChildWindow::~GalleryChildWindow()
{
DBG_DTOR(GalleryChildWindow,NULL);
}
-// -----------------------------------------------------------------------------
-
SFX_IMPL_DOCKINGWINDOW_WITHID( GalleryChildWindow, SID_GALLERY )
-// ------------------
// - GalleryBrowser -
-// ------------------
+
DBG_NAME(GalleryBrowser)
GalleryBrowser::GalleryBrowser(
@@ -103,8 +95,6 @@ GalleryBrowser::GalleryBrowser(
InitSettings();
}
-// -----------------------------------------------------------------------------
-
GalleryBrowser::~GalleryBrowser()
{
delete mpBrowser2;
@@ -114,8 +104,6 @@ GalleryBrowser::~GalleryBrowser()
DBG_DTOR(GalleryBrowser,NULL);
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser::InitSettings()
{
SetBackground( Wallpaper( GALLERY_DLG_COLOR ) );
@@ -135,8 +123,6 @@ void GalleryBrowser::InitSettings()
mpBrowser2->SetControlForeground( GALLERY_DLG_COLOR );
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser::Resize()
{
// call parent
@@ -199,8 +185,6 @@ void GalleryBrowser::Resize()
maLastSize = aNewSize;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
{
const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
@@ -236,30 +220,22 @@ sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryBrowser::Close()
{
return SfxDockingWindow::Close();
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser::GetFocus()
{
SfxDockingWindow::GetFocus();
mpBrowser1->GrabFocus();
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser::ThemeSelectionHasChanged()
{
mpBrowser2->SelectTheme( mpBrowser1->GetSelectedTheme() );
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(GalleryBrowser, SplitHdl)
{
if(mpSplitter->IsHorizontal())
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 48bb7c4..a860cbb 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -38,39 +38,29 @@
#include <svx/svxdlg.hxx>
-// --------------
// - Namespaces -
-// --------------
using namespace ::rtl;
using namespace ::com::sun::star;
-// -----------------
// - GalleryButton -
-// -----------------
GalleryButton::GalleryButton( GalleryBrowser1* pParent, WinBits nWinBits ) :
PushButton( pParent, nWinBits )
{
}
-// -----------------------------------------------------------------------------
-
GalleryButton::~GalleryButton()
{
}
-// -----------------------------------------------------------------------------
-
void GalleryButton::KeyInput( const KeyEvent& rKEvt )
{
if( !static_cast< GalleryBrowser1* >( GetParent() )->KeyInput( rKEvt, this ) )
PushButton::KeyInput( rKEvt );
}
-// -----------------------
// - GalleryThemeListBox -
-// -----------------------
GalleryThemeListBox::GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWinBits ) :
ListBox( pParent, nWinBits )
@@ -78,14 +68,10 @@ GalleryThemeListBox::GalleryThemeListBox( GalleryBrowser1* pParent, WinBits nWin
InitSettings();
}
-// -----------------------------------------------------------------------------
-
GalleryThemeListBox::~GalleryThemeListBox()
{
}
-// ------------------------------------------------------------------------
-
void GalleryThemeListBox::InitSettings()
{
SetBackground( Wallpaper( GALLERY_BG_COLOR ) );
@@ -93,8 +79,6 @@ void GalleryThemeListBox::InitSettings()
SetControlForeground( GALLERY_FG_COLOR );
}
-// -----------------------------------------------------------------------
-
void GalleryThemeListBox::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
@@ -103,8 +87,6 @@ void GalleryThemeListBox::DataChanged( const DataChangedEvent& rDCEvt )
ListBox::DataChanged( rDCEvt );
}
-// -----------------------------------------------------------------------------
-
long GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt )
{
long nDone = 0;
@@ -127,9 +109,7 @@ long GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt )
return( nDone ? nDone : ListBox::PreNotify( rNEvt ) );
}
-// -------------------
// - GalleryBrowser1 -
-// -------------------
GalleryBrowser1::GalleryBrowser1(
Window* pParent,
@@ -172,8 +152,6 @@ GalleryBrowser1::GalleryBrowser1(
mpThemes->Show( sal_True );
}
-// -----------------------------------------------------------------------------
-
GalleryBrowser1::~GalleryBrowser1()
{
EndListening( *mpGallery );
@@ -183,8 +161,6 @@ GalleryBrowser1::~GalleryBrowser1()
mpExchangeData = NULL;
}
-// -----------------------------------------------------------------------------
-
sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
{
static const sal_Bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
@@ -208,8 +184,6 @@ sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEnt
return nRet;
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ImplAdjustControls()
{
const Size aOutSize( GetOutputSizePixel() );
@@ -223,8 +197,6 @@ void GalleryBrowser1::ImplAdjustControls()
Size( aOutSize.Width(), aOutSize.Height() - nStartY ) );
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData )
{
rData.pTheme = (GalleryTheme*) pThm;
@@ -252,8 +224,6 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
}
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
{
GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
@@ -291,8 +261,6 @@ void GalleryBrowser1::ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec)
}
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew )
{
DBG_ASSERT(!mpThemePropsDlgItemSet, "mpThemePropsDlgItemSet already set!");
@@ -318,8 +286,6 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, b
}
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog, bool bCreateNew )
{
long nRet = pDialog->GetResult();
@@ -363,24 +329,18 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog
Application::PostUserEvent( LINK( this, GalleryBrowser1, DestroyThemePropertiesDlgHdl ) );
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( GalleryBrowser1, EndNewThemePropertiesDlgHdl, VclAbstractDialog2*, pDialog )
{
ImplEndGalleryThemeProperties( pDialog, true );
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( GalleryBrowser1, EndThemePropertiesDlgHdl, VclAbstractDialog2*, pDialog )
{
ImplEndGalleryThemeProperties( pDialog, false );
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, pDialog )
{
delete pDialog;
@@ -389,8 +349,6 @@ IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, p
return 0L;
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
{
switch( nId )
@@ -485,16 +443,12 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
}
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::Resize()
{
Control::Resize();
ImplAdjustControls();
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::GetFocus()
{
Control::GetFocus();
@@ -502,8 +456,6 @@ void GalleryBrowser1::GetFocus()
mpThemes->GrabFocus();
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const GalleryHint& rGalleryHint = (const GalleryHint&) rHint;
@@ -560,15 +512,11 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-// -----------------------------------------------------------------------------
-
void GalleryBrowser1::ShowContextMenu()
{
Application::PostUserEvent( LINK( this, GalleryBrowser1, ShowContextMenuHdl ), this );
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
{
sal_Bool bRet (sal_False);
@@ -638,8 +586,6 @@ sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
return bRet;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
{
::std::vector< sal_uInt16 > aExecVector;
@@ -669,16 +615,12 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl)
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu )
{
ImplExecute( pMenu->GetCurItemId() );
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl)
{
if (maThemeSlectionHandler)
@@ -686,8 +628,6 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl)
return 0L;
}
-// -----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl)
{
OUString aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) );
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index e1c2ac6..4d44675 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -26,9 +26,7 @@
#include <boost/function.hpp>
-// -----------------
// - GalleryButton -
-// -----------------
class GalleryButton : public PushButton
{
@@ -42,9 +40,7 @@ public:
~GalleryButton();
};
-// -----------------------
// - GalleryThemeListBox -
-// -----------------------
class GalleryThemeListBox : public ListBox
{
@@ -61,9 +57,7 @@ public:
~GalleryThemeListBox();
};
-// -------------------
// - GalleryBrowser1 -
-// -------------------
class Gallery;
class GalleryThemeEntry;
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 3d96b22..f446294 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -32,9 +32,7 @@ namespace
class theLockListener : public rtl::Static< SfxListener, theLockListener > {};
}
-// -------------------
// - GalleryExplorer -
-// -------------------
bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
{
@@ -54,8 +52,6 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
return !rThemeList.empty();
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<String> &rObjList )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -77,8 +73,6 @@ sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<S
return !rObjList.empty();
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -105,8 +99,6 @@ bool GalleryExplorer::FillObjList( const sal_uInt32 nThemeId, std::vector<OUStri
return true;
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -133,8 +125,6 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
return !rList.empty();
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::InsertURL( const OUString& rThemeName, const OUString& rURL )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -157,16 +147,12 @@ sal_Bool GalleryExplorer::InsertURL( const OUString& rThemeName, const OUString&
return bRet;
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const OUString& rURL )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL ) : sal_False );
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic, BitmapEx* pThumb,
sal_Bool bProgress )
@@ -194,8 +180,6 @@ sal_Bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uIntPtr
return bRet;
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
Graphic* pGraphic, BitmapEx* pThumb,
sal_Bool bProgress )
@@ -204,8 +188,6 @@ sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : sal_False );
}
-// ------------------------------------------------------------------------
-
sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -229,16 +211,12 @@ sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
return nRet;
}
-// ------------------------------------------------------------------------
-
sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb )
{
@@ -274,8 +252,6 @@ sal_Bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSd
return bRet;
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb )
{
@@ -283,8 +259,6 @@ sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModel
return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False );
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::BeginLocking( const OUString& rThemeName )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -304,16 +278,12 @@ sal_Bool GalleryExplorer::BeginLocking( const OUString& rThemeName )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::EndLocking( const OUString& rThemeName )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
@@ -343,8 +313,6 @@ sal_Bool GalleryExplorer::EndLocking( const OUString& rThemeName )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 5cb3385..b5f7767 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -21,8 +21,6 @@
#include "helpid.hrc"
#include "gallery.hrc"
-/******************************************************************************/
-
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
DockingWindow RID_SVXDLG_GALLERYBROWSER
@@ -63,8 +61,6 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER
};
};
-/******************************************************************************/
-
String RID_SVXSTR_GALLERY_ACTUALIZE_PROGRESS
{
Text [ en-US ] = "Update";
@@ -170,8 +166,6 @@ String RID_SVXSTR_GALLERY_LISTVIEW
Text [ en-US ] = "Detailed View";
};
-/******************************************************************************/
-
Bitmap RID_SVXBMP_GALLERY
{
File = "lx03135.bmp" ;
@@ -244,8 +238,6 @@ Image RID_SVXIMG_GALLERY_VIEW_LIST
MASKCOLOR
};
-/******************************************************************************/
-
Menu RID_SVXMN_GALLERY1
{
ItemList =
@@ -294,8 +286,6 @@ Menu RID_SVXMN_GALLERY1
};
};
-/******************************************************************************/
-
Menu RID_SVXMN_GALLERY2
{
ItemList =
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 40e638f..110d951 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -34,16 +34,12 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
-// --------------
// - Namespaces -
-// --------------
using namespace ::rtl;
using namespace ::com::sun::star;
-// ---------------------
// - GalleryThemeEntry -
-// ---------------------
GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const OUString& rName,
sal_Bool _bReadOnly, sal_Bool _bNewFile,
@@ -80,8 +76,6 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const OUStr
aName = rName;
}
-// -----------------------------------------------------------------------------
-
INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL ) const
{
INetURLObject aURL( rURL );
@@ -102,8 +96,6 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL
return aURL;
}
-// -----------------------------------------------------------------------------
-
void GalleryThemeEntry::SetName( const OUString& rNewName )
{
if( aName != rNewName )
@@ -114,8 +106,6 @@ void GalleryThemeEntry::SetName( const OUString& rNewName )
}
}
-// -----------------------------------------------------------------------------
-
void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName )
{
nId = nNewId;
@@ -123,9 +113,7 @@ void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName )
bThemeNameFromResource = ( nId && bResetThemeName );
}
-// --------------------------
// - GalleryThemeCacheEntry -
-// --------------------------
class GalleryThemeCacheEntry
{
@@ -144,9 +132,7 @@ public:
GalleryTheme* GetTheme() const { return mpTheme; }
};
-// -----------
// - Gallery -
-// -----------
Gallery::Gallery( const OUString& rMultiPath )
: nReadTextEncoding ( osl_getThreadTextEncoding() )
@@ -155,18 +141,14 @@ Gallery::Gallery( const OUString& rMultiPath )
ImplLoad( rMultiPath );
}
-// ------------------------------------------------------------------------
-
Gallery::~Gallery()
{
- // Themen-Liste loeschen
+ // erase theme list
for ( size_t i = 0, n = aThemeList.size(); i < n; ++i )
delete aThemeList[ i ];
aThemeList.clear();
}
-// ------------------------------------------------------------------------
-
Gallery* Gallery::GetGalleryInstance()
{
static Gallery* pGallery = NULL;
@@ -183,8 +165,6 @@ Gallery* Gallery::GetGalleryInstance()
return pGallery;
}
-// ------------------------------------------------------------------------
-
void Gallery::ImplLoad( const OUString& rMultiPath )
{
const sal_Int32 nTokenCount = comphelper::string::getTokenCount(rMultiPath, ';');
@@ -219,8 +199,6 @@ void Gallery::ImplLoad( const OUString& rMultiPath )
DBG_ASSERT( aRelURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
}
-// ------------------------------------------------------------------------
-
void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsReadOnly )
{
rbDirIsReadOnly = sal_False;
@@ -406,8 +384,6 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
}
}
-// ------------------------------------------------------------------------
-
GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName )
{
GalleryThemeEntry* pFound = NULL;
@@ -422,8 +398,6 @@ GalleryThemeEntry* Gallery::ImplGetThemeEntry( const OUString& rThemeName )
return pFound;
}
-// ------------------------------------------------------------------------
-
OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
{
GalleryThemeEntry* pFound = NULL;
@@ -503,15 +477,11 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
return( pFound ? pFound->GetThemeName() : OUString() );
}
-// ------------------------------------------------------------------------
-
sal_Bool Gallery::HasTheme( const OUString& rThemeName )
{
return( ImplGetThemeEntry( rThemeName ) != NULL );
}
-// ------------------------------------------------------------------------
-
sal_Bool Gallery::CreateTheme( const OUString& rThemeName )
{
sal_Bool bRet = sal_False;
@@ -532,14 +502,12 @@ sal_Bool Gallery::CreateTheme( const OUString& rThemeName )
return bRet;
}
-// ------------------------------------------------------------------------
-
sal_Bool Gallery::RenameTheme( const OUString& rOldName, const OUString& rNewName )
{
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rOldName );
sal_Bool bRet = sal_False;
- // Ueberpruefen, ob neuer Themenname schon vorhanden ist
+ // check if the new theme name is already present
if( pThemeEntry && !HasTheme( rNewName ) && !pThemeEntry->IsReadOnly() )
{
SfxListener aListener;
@@ -561,8 +529,6 @@ sal_Bool Gallery::RenameTheme( const OUString& rOldName, const OUString& rNewNam
return bRet;
}
-// ------------------------------------------------------------------------
-
sal_Bool Gallery::RemoveTheme( const OUString& rThemeName )
{
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName );
@@ -607,8 +573,6 @@ sal_Bool Gallery::RemoveTheme( const OUString& rThemeName )
return bRet;
}
-// ------------------------------------------------------------------------
-
GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry )
{
GalleryTheme* pTheme = NULL;
@@ -656,8 +620,6 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry
return pTheme;
}
-// ------------------------------------------------------------------------
-
void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme )
{
for (GalleryCacheThemeList::iterator it = aThemeCache.begin(); it != aThemeCache.end(); ++it)
@@ -671,8 +633,6 @@ void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme )
}
}
-// ------------------------------------------------------------------------
-
GalleryTheme* Gallery::AcquireTheme( const OUString& rThemeName, SfxListener& rListener )
{
GalleryTheme* pTheme = NULL;
@@ -684,8 +644,6 @@ GalleryTheme* Gallery::AcquireTheme( const OUString& rThemeName, SfxListener& rL
return pTheme;
}
-// ------------------------------------------------------------------------
-
void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
{
if( pTheme )
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 94cea90..a2f04bf 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -47,17 +47,9 @@
#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
-// --------------
-// - Namespaces -
-// --------------
-
using namespace ::rtl;
using namespace ::com::sun::star;
-// ----------
-// - ResMgr -
-// ----------
-
ResMgr* GetGalleryResMgr()
{
static ResMgr* pGalleryResMgr = NULL;
@@ -71,10 +63,6 @@ ResMgr* GetGalleryResMgr()
return pGalleryResMgr;
}
-// -------------------------
-// - GalleryResGetBitmapEx -
-// -------------------------
-
BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId )
{
BitmapEx aBmpEx( GAL_RES( nId ) );
@@ -85,10 +73,6 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId )
return aBmpEx;
}
-// ----------------------
-// - SgaUserDataFactory -
-// ----------------------
-
IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
{
if ( pObjFactory->nInventor == IV_IMAPINFO && pObjFactory->nIdentifier == ID_IMAPINFO )
@@ -97,10 +81,6 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
return 0L;
}
-// ------------------------
-// - GalleryGraphicImport -
-// ------------------------
-
sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
OUString& rFilterName, sal_Bool bShowProgress )
{
@@ -129,10 +109,6 @@ sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
return nRet;
}
-// -----------------------
-// - GallerySvDrawImport -
-// -----------------------
-
sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
{
sal_uInt32 nVersion;
@@ -177,10 +153,6 @@ sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
return bRet;
}
-// ---------------------
-// - CreateIMapGraphic -
-// ---------------------
-
sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
{
sal_Bool bRet = sal_False;
@@ -194,7 +166,7 @@ sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageM
{
const sal_uInt16 nCount = pObj->GetUserDataCount();
- // gibt es in den User-Daten eine IMap-Information?
+ // Exist in the user data an IMap information?
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
const SdrObjUserData* pUserData = pObj->GetUserData( i );
@@ -213,10 +185,6 @@ sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageM
return bRet;
}
-// --------------------
-// - GetReducedString -
-// --------------------
-
OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen )
{
OUString aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
@@ -243,8 +211,6 @@ OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen )
return aReduced;
}
-// -----------------------------------------------------------------------------
-
String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
{
OUString aRet;
@@ -258,8 +224,6 @@ String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
return aRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool FileExists( const INetURLObject& rURL )
{
sal_Bool bRet = sal_False;
@@ -288,8 +252,6 @@ sal_Bool FileExists( const INetURLObject& rURL )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool CreateDir( const INetURLObject& rURL )
{
sal_Bool bRet = FileExists( rURL );
@@ -325,8 +287,6 @@ sal_Bool CreateDir( const INetURLObject& rURL )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
{
sal_Bool bRet = sal_False;
@@ -353,8 +313,6 @@ sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool KillFile( const INetURLObject& rURL )
{
sal_Bool bRet = FileExists( rURL );
@@ -383,9 +341,6 @@ sal_Bool KillFile( const INetURLObject& rURL )
return bRet;
}
-// -------------------
-// - GalleryProgress -
-// -------------------
DBG_NAME(GalleryProgress)
GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
@@ -423,24 +378,17 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
}
}
-// ------------------------------------------------------------------------
-
GalleryProgress::~GalleryProgress()
{
DBG_DTOR(GalleryProgress,NULL);
}
-// ------------------------------------------------------------------------
-
void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
{
if( mxProgressBar.is() && nMaxVal )
mxProgressBar->setValue( std::min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
}
-// -----------------------
-// - GalleryTransferable -
-// -----------------------
DBG_NAME(GalleryTransferable)
GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
@@ -456,15 +404,11 @@ GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObj
InitData( bLazy );
}
-// ------------------------------------------------------------------------
-
GalleryTransferable::~GalleryTransferable()
{
DBG_DTOR(GalleryTransferable,NULL);
}
-// ------------------------------------------------------------------------
-
void GalleryTransferable::InitData( bool bLazy )
{
switch( meObjectKind )
@@ -524,8 +468,6 @@ void GalleryTransferable::InitData( bool bLazy )
}
}
-// ------------------------------------------------------------------------
-
void GalleryTransferable::AddSupportedFormats()
{
if( SGA_OBJ_SVDRAW == meObjectKind )
@@ -558,8 +500,6 @@ void GalleryTransferable::AddSupportedFormats()
}
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor )
{
sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
@@ -596,8 +536,6 @@ sal_Bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor )
return bRet;
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject,
sal_uInt32, const datatransfer::DataFlavor& )
{
@@ -612,8 +550,6 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU
return bRet;
}
-// ------------------------------------------------------------------------
-
void GalleryTransferable::DragFinished( sal_Int8 nDropAction )
{
mpTheme->SetDragging( sal_False );
@@ -626,8 +562,6 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction )
}
}
-// ------------------------------------------------------------------------
-
void GalleryTransferable::ObjectReleased()
{
mxModelStream.Clear();
@@ -636,15 +570,11 @@ void GalleryTransferable::ObjectReleased()
delete mpURL, mpURL = NULL;
}
-// ------------------------------------------------------------------------
-
void GalleryTransferable::CopyToClipboard( Window* pWindow )
{
TransferableHelper::CopyToClipboard( pWindow );
}
-// ------------------------------------------------------------------------
-
void GalleryTransferable::StartDrag( Window* pWindow, sal_Int8 nDragSourceActions,
sal_Int32 nDragPointer, sal_Int32 nDragImage )
{
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index ed84ca2..cb4f07a 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -41,10 +41,6 @@
using namespace ::com::sun::star;
-// -------------
-// - SgaObject -
-// -------------
-
SgaObject::SgaObject()
: bIsValid ( sal_False ),
bIsThumbBmp ( sal_True )
@@ -93,8 +89,6 @@ BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const
return aRetval;
}
-// ------------------------------------------------------------------------
-
sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
{
sal_Bool bRet = sal_False;
@@ -173,8 +167,6 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
return bRet;
}
-// ------------------------------------------------------------------------
-
void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
@@ -203,8 +195,6 @@ void SgaObject::WriteData( SvStream& rOut, const OUString& rDestDir ) const
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aURLWithoutDestDir, RTL_TEXTENCODING_UTF8);
}
-// ------------------------------------------------------------------------
-
void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
{
sal_uInt32 nTmp32;
@@ -225,8 +215,6 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
aURL = INetURLObject(aTmpStr);
}
-// ------------------------------------------------------------------------
-
const OUString SgaObject::GetTitle() const
{
OUString aReturnValue( aTitle );
@@ -259,23 +247,17 @@ const OUString SgaObject::GetTitle() const
return aReturnValue;
}
-// ------------------------------------------------------------------------
-
void SgaObject::SetTitle( const OUString& rTitle )
{
aTitle = rTitle;
}
-// ------------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
{
rObj.WriteData( rOut, "" );
return rOut;
}
-// ------------------------------------------------------------------------
-
SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
{
sal_uInt16 nReadVersion;
@@ -286,16 +268,10 @@ SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
return rIn;
}
-// ----------------
-// - SgaObjectBmp -
-// ----------------
-
SgaObjectBmp::SgaObjectBmp()
{
}
-// ------------------------------------------------------------------------
-
SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL )
{
Graphic aGraphic;
@@ -305,27 +281,21 @@ SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL )
Init( aGraphic, rURL );
}
-// ------------------------------------------------------------------------
-
SgaObjectBmp::SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& )
{
if( FileExists( rURL ) )
Init( rGraphic, rURL );
}
-// ------------------------------------------------------------------------
-
void SgaObjectBmp::Init( const Graphic& rGraphic, const INetURLObject& rURL )
{
aURL = rURL;
bIsValid = CreateThumb( rGraphic );
}
-// ------------------------------------------------------------------------
-
void SgaObjectBmp::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
- // Version setzen
+ // Set version
SgaObject::WriteData( rOut, rDestDir );
char aDummy[ 10 ];
rOut.Write( aDummy, 10 );
@@ -333,8 +303,6 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const OUString& rDestDir ) const
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8);
}
-// ------------------------------------------------------------------------
-
void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
@@ -346,9 +314,6 @@ void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
aTitle = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rIn, RTL_TEXTENCODING_UTF8);
}
-// ------------------
-// - SgaObjectSound -
-// ------------------
DBG_NAME(SgaObjectSound)
SgaObjectSound::SgaObjectSound() :
@@ -357,8 +322,6 @@ SgaObjectSound::SgaObjectSound() :
DBG_CTOR(SgaObjectSound,NULL);
}
-// ------------------------------------------------------------------------
-
SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
eSoundType( SOUND_STANDARD )
{
@@ -374,15 +337,11 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
bIsValid = sal_False;
}
-// ------------------------------------------------------------------------
-
SgaObjectSound::~SgaObjectSound()
{
DBG_DTOR(SgaObjectSound,NULL);
}
-// ------------------------------------------------------------------------
-
BitmapEx SgaObjectSound::GetThumbBmp() const
{
sal_uInt16 nId;
@@ -408,8 +367,6 @@ BitmapEx SgaObjectSound::GetThumbBmp() const
return aBmpEx;
}
-// ------------------------------------------------------------------------
-
void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
SgaObject::WriteData( rOut, rDestDir );
@@ -417,8 +374,6 @@ void SgaObjectSound::WriteData( SvStream& rOut, const OUString& rDestDir ) const
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8);
}
-// ------------------------------------------------------------------------
-
void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
SgaObject::ReadData( rIn, rReadVersion );
@@ -434,16 +389,10 @@ void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
}
}
-// -----------------
-// - SgaObjectAnim -
-// -----------------
-
SgaObjectAnim::SgaObjectAnim()
{
}
-// ------------------------------------------------------------------------
-
SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic,
const INetURLObject& rURL,
const OUString& )
@@ -452,38 +401,25 @@ SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic,
bIsValid = CreateThumb( rGraphic );
}
-// -----------------
-// - SgaObjectINet -
-// -----------------
-
SgaObjectINet::SgaObjectINet()
{
}
-// ------------------------------------------------------------------------
-
SgaObjectINet::SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName ) :
SgaObjectAnim ( rGraphic, rURL, rFormatName )
{
}
-// -------------------
-// - SgaObjectSvDraw -
-// -------------------
-
SgaObjectSvDraw::SgaObjectSvDraw()
{
}
-// ------------------------------------------------------------------------
-
SgaObjectSvDraw::SgaObjectSvDraw( const FmFormModel& rModel, const INetURLObject& rURL )
{
aURL = rURL;
bIsValid = CreateThumb( rModel );
}
-// ------------------------------------------------------------------------
DBG_NAME(SvxGalleryDrawModel)
SvxGalleryDrawModel::SvxGalleryDrawModel()
@@ -512,8 +448,6 @@ SvxGalleryDrawModel::SvxGalleryDrawModel()
}
}
-// ------------------------------------------------------------------------
-
SvxGalleryDrawModel::~SvxGalleryDrawModel()
{
if( mxDoc.Is() )
@@ -522,8 +456,6 @@ SvxGalleryDrawModel::~SvxGalleryDrawModel()
DBG_DTOR(SvxGalleryDrawModel,NULL);
}
-// ------------------------------------------------------------------------
-
SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
{
SvxGalleryDrawModel aModel;
@@ -538,8 +470,6 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
}
}
-// ------------------------------------------------------------------------
-
sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
{
Graphic aGraphic;
@@ -597,16 +527,12 @@ sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
return bRet;
}
-// ------------------------------------------------------------------------
-
void SgaObjectSvDraw::WriteData( SvStream& rOut, const OUString& rDestDir ) const
{
SgaObject::WriteData( rOut, rDestDir );
write_lenPrefixed_uInt8s_FromOUString<sal_uInt16>(rOut, aTitle, RTL_TEXTENCODING_UTF8);
}
-// ------------------------------------------------------------------------
-
void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
SgaObject::ReadData( rIn, rReadVersion );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 8857d8d..e8dbea5 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -52,16 +52,11 @@
#include <vcl/lstbox.hxx>
#include "gallerydrawmodel.hxx"
-// --------------
-// - Namespaces -
-// --------------
-
using namespace ::rtl;
using namespace ::com::sun::star;
-// ------------
// - SgaTheme -
-// ------------
+
DBG_NAME(GalleryTheme)
GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) :
@@ -77,8 +72,6 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
ImplCreateSvDrawStorage();
}
-// ------------------------------------------------------------------------
-
GalleryTheme::~GalleryTheme()
{
ImplWrite();
@@ -95,8 +88,6 @@ GalleryTheme::~GalleryTheme()
DBG_DTOR(GalleryTheme,NULL);
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::ImplCreateSvDrawStorage()
{
aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
@@ -105,8 +96,6 @@ void GalleryTheme::ImplCreateSvDrawStorage()
aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry )
{
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
@@ -149,8 +138,6 @@ sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, G
return bRet;
}
-// ------------------------------------------------------------------------
-
SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
{
SgaObject* pSgaObj = NULL;
@@ -163,7 +150,7 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
{
sal_uInt32 nInventor;
- // Ueberpruefen, ob das File ein gueltiges SGA-File ist
+ // Check to ensure that the file is a valid SGA file
pIStm->Seek( pEntry->nOffset );
*pIStm >> nInventor;
@@ -197,8 +184,6 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
return pSgaObj;
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::ImplWrite()
{
if( IsModified() )
@@ -229,8 +214,6 @@ void GalleryTheme::ImplWrite()
}
}
-// ------------------------------------------------------------------------
-
const GalleryObject* GalleryTheme::ImplGetGalleryObject( const INetURLObject& rURL )
{
for ( size_t i = 0, n = aObjectList.size(); i < n; ++i )
@@ -239,8 +222,6 @@ const GalleryObject* GalleryTheme::ImplGetGalleryObject( const INetURLObject& rU
return NULL;
}
-// ------------------------------------------------------------------------
-
INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
{
INetURLObject aURL;
@@ -251,8 +232,6 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
return aURL;
}
-// ------------------------------------------------------------------------
-
INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat )
{
INetURLObject aDir( GetParent()->GetUserURL() );
@@ -345,8 +324,6 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt
return aNewURL;
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
{
if( !IsBroadcasterLocked() )
@@ -358,8 +335,6 @@ void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
}
}
-// ------------------------------------------------------------------------
-
sal_Bool GalleryTheme::UnlockTheme()
{
DBG_ASSERT( mnThemeLockCount, "Theme is not locked" );
@@ -375,8 +350,6 @@ sal_Bool GalleryTheme::UnlockTheme()
return bRet;
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos )
{
DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" );
@@ -385,8 +358,6 @@ void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos )
ImplBroadcast( nUpdatePos );
}
-// ------------------------------------------------------------------------
-
bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
{
sal_Bool bRet = sal_False;
@@ -435,15 +406,11 @@ bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
return bRet;
}
-// ------------------------------------------------------------------------
-
SgaObject* GalleryTheme::AcquireObject( size_t nPos )
{
return ImplReadSgaObject( aObjectList[ nPos ] );
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBitmapEx, Size& rSize, OUString& rTitle, OUString& rPath) const
{
const GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : NULL;
@@ -461,8 +428,6 @@ void GalleryTheme::GetPreviewBitmapExAndStrings(sal_uIntPtr nPos, BitmapEx& rBit
}
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx& rBitmapEx, const Size& rSize, const OUString& rTitle, const OUString& rPath)
{
GalleryObject* pGalleryObject = nPos < aObjectList.size() ? aObjectList[ nPos ] : NULL;
@@ -480,15 +445,11 @@ void GalleryTheme::SetPreviewBitmapExAndStrings(sal_uIntPtr nPos, const BitmapEx
}
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::ReleaseObject( SgaObject* pObject )
{
delete pObject;
}
-// ------------------------------------------------------------------------
-
bool GalleryTheme::RemoveObject( size_t nPos )
{
GalleryObject* pEntry = NULL;
@@ -519,8 +480,6 @@ bool GalleryTheme::RemoveObject( size_t nPos )
return( pEntry != NULL );
}
-// ------------------------------------------------------------------------
-
bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
{
sal_Bool bRet = sal_False;
@@ -548,8 +507,6 @@ bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos )
return bRet;
}
-// ------------------------------------------------------------------------
-
void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProgress )
{
if( !IsReadOnly() )
@@ -562,7 +519,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
LockBroadcaster();
bAbortActualize = sal_False;
- // LoeschFlag zuruecksetzen
+ // reset delete flag
for (size_t i = 0; i < nCount; i++)
aObjectList[ i ]->mbDelete = false;
@@ -577,12 +534,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
rActualizeLink.Call( (void*) &aURL );
- // SvDraw-Objekte werden spaeter aktualisiert
+ // SvDraw objects will be updated later
if( pEntry->eObjKind != SGA_OBJ_SVDRAW )
{
- // Hier muss noch etwas eingebaut werden,
- // das Files auf den ensprechenden Eintrag matched
- // Grafiken als Grafik-Objekte in die Gallery aufnehmen
+ // Still a function should be implemented,
+ // which assigns files to the relevant entry.
+ // insert graphics as graphic objects into the gallery
if( pEntry->eObjKind == SGA_OBJ_SOUND )
{
SgaObjectSound aObjSound( aURL );
@@ -610,7 +567,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
delete pNewObj;
}
else
- pEntry->mbDelete = true; // Loesch-Flag setzen
+ pEntry->mbDelete = true; // set delete flag
}
}
else
@@ -725,8 +682,6 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
}
}
-// ------------------------------------------------------------------------
-
GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly )
{
DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -752,7 +707,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa
OString aTmpStr = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(*pIStm);
aThemeName = OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8);
- // Charakterkonvertierung durchfuehren
+ // execute a charakter conversion
if( nVersion >= 0x0004 )
{
sal_uInt32 nCount;
@@ -761,9 +716,9 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa
*pIStm >> nCount >> nTemp16;
pIStm->Seek( STREAM_SEEK_TO_END );
- // pruefen, ob es sich um eine neuere Version handelt;
- // daher um 520Bytes (8Bytes Kennung + 512Bytes Reserverpuffer ) zurueckspringen,
- // falls dies ueberhaupt moeglich ist
+ // check whether there is a newer version;
+ // therefore jump back by 520Bytes (8 bytes ID + 512Bytes reserve buffer)
+ // if this is at all possible.
if( pIStm->Tell() >= 520 )
{
sal_uInt32 nId1, nId2;
@@ -801,8 +756,6 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sa
return pRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, sal_Bool )
{
SgaObject* pObj = AcquireObject( nPos );
@@ -818,8 +771,6 @@ sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, sal_Bool )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
@@ -893,8 +844,6 @@ sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos )
{
sal_Bool bRet = sal_False;
@@ -972,8 +921,6 @@ sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInse
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
@@ -1001,8 +948,6 @@ sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos )
{
INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
@@ -1048,8 +993,6 @@ sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInse
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxModelStream, sal_Bool )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
@@ -1101,8 +1044,6 @@ sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rx
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos )
{
INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
@@ -1137,8 +1078,6 @@ sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStre
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
@@ -1153,8 +1092,6 @@ sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool )
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos )
{
Graphic aGraphic;
@@ -1183,8 +1120,6 @@ sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsert
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos )
{
INetURLObject aURL;
@@ -1234,8 +1169,6 @@ sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, s
return bRet;
}
-// -----------------------------------------------------------------------------
-
sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos )
{
sal_Bool bRet = sal_False;
@@ -1340,24 +1273,18 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X
return bRet;
}
-// -----------------------------------------------------------------------------
-
void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos )
{
GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false );
pTransferable->CopyToClipboard( pWindow );
}
-// -----------------------------------------------------------------------------
-
void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos )
{
GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true );
pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK );
}
-// -----------------------------------------------------------------------------
-
SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
{
const INetURLObject aRelURL1( GetParent()->GetRelativeURL() );
@@ -1423,18 +1350,18 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
rOStm << pObj->nOffset << (sal_uInt16) pObj->eObjKind;
}
- // neuerdings wird ein 512-Byte-Reservepuffer gechrieben;
- // um diesen zu erkennen werden zwei sal_uIntPtr-Ids geschrieben
+ // more recently, a 512-byte reserve buffer is written,
+ // to recognize them two sal_uIntPtr-Ids will be written.
rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' );
const long nReservePos = rOStm.Tell();
VersionCompat* pCompat = new VersionCompat( rOStm, STREAM_WRITE, 2 );
- rOStm << (sal_uInt32) GetId() << IsThemeNameFromResource(); // ab Version 2
+ rOStm << (sal_uInt32) GetId() << IsThemeNameFromResource(); // From version 2 and up
delete pCompat;
- // Rest des Puffers auffuellen
+ // Fill the rest of the buffer.
const long nRest = std::max( 512L - ( (long) rOStm.Tell() - nReservePos ), 0L );
if( nRest )
@@ -1448,8 +1375,6 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
return rOStm;
}
-// ------------------------------------------------------------------------
-
SvStream& GalleryTheme::ReadData( SvStream& rIStm )
{
sal_uInt32 nCount;
@@ -1556,9 +1481,9 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
rIStm >> nId1 >> nId2;
- // in neueren Versionen befindet sich am Ende ein 512-Byte-Reservepuffer;
- // die Daten befinden sich am Anfang dieses Puffers und
- // sind durch eine VersionCompat geklammert
+ // In newer versions a 512 byte reserve buffer is located at the end,
+ // the data is located at the beginning of this buffer and are clamped
+ // by a VersionCompat.
if( !rIStm.IsEof() &&
nId1 == COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) &&
nId2 == COMPAT_FORMAT( 'E', 'S', 'R', 'V' ) )
@@ -1586,15 +1511,11 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
return rIStm;
}
-// ------------------------------------------------------------------------
-
SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme )
{
return rTheme.WriteData( rOut );
}
-// ------------------------------------------------------------------------
-
SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme )
{
return rTheme.ReadData( rIn );
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index d926a95..d692cf0 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -19,122 +19,88 @@
#include "gallery.hrc"
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_3D
{
Text [ en-US ] = "3D Effects";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ANIMATIONS
{
Text [ en-US ] = "Animations";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_BULLETS
{
Text [ en-US ] = "Bullets";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_OFFICE
{
Text [ en-US ] = "Office";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FLAGS
{
Text [ en-US ] = "Flags";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FLOWCHARTS
{
Text [ en-US ] = "Flow Charts";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_EMOTICONS
{
Text [ en-US ] = "Emoticons";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS
{
Text [ en-US ] = "Pictures";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_BACKGROUNDS
{
Text [ en-US ] = "Backgrounds";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_HOMEPAGE
{
Text [ en-US ] = "Homepage";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_INTERACTION
{
Text [ en-US ] = "Interaction";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS
{
Text [ en-US ] = "Maps";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PEOPLE
{
Text [ en-US ] = "People";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SURFACES
{
Text [ en-US ] = "Surfaces";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_HTMLBUTTONS
{
// !!! Don't translate, please !!!
Text = "private://gallery/hidden/HtmlExportButtons";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_POWERPOINT
{
// !!! Don't translate, please !!!
Text = "private://gallery/hidden/imgppt";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMPUTERS
{
Text [ en-US ] = "Computers";
@@ -165,886 +131,633 @@ String RID_GALLERYSTR_THEME_TXTSHAPES
Text [ en-US ] = "Textshapes";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SOUNDS
{
Text [ en-US ] = "Sounds";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SYMBOLS
{
Text [ en-US ] = "Symbols";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MYTHEME
{
Text [ en-US ] = "My Theme";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_USERSOUNDS
{
// !!! Don't translate, please !!!
Text = "private://gallery/hidden/usersounds";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARROWS
{
Text [ en-US ] = "Arrows";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_BALLOONS
{
Text [ en-US ] = "Balloons";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_KEYBOARD
{
Text [ en-US ] = "Keyboard";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_TIME
{
Text [ en-US ] = "Time";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PRESENTATION
{
Text [ en-US ] = "Presentation";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CALENDAR
{
Text [ en-US ] = "Calendar";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_NAVIGATION
{
Text [ en-US ] = "Navigation";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMMUNICATION
{
Text [ en-US ] = "Communication";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FINANCES
{
Text [ en-US ] = "Finances";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMPUTER
{
Text [ en-US ] = "Computers";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLIMA
{
Text [ en-US ] = "Climate";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_EDUCATION
{
Text [ en-US ] = "School & University";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_TROUBLE
{
Text [ en-US ] = "Problem Solving";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SCREENBEANS
{
Text [ en-US ] = "Screen Beans";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FONTWORK
{
// !!! Don't translate, please !!!
Text = "private://gallery/hidden/fontwork";
};
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FONTWORK_VERTICAL
{
// !!! Don't translate, please !!!
Text = "private://gallery/hidden/fontworkvertical";
};
-
-// -----------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_DUMMY5
{
// !!! Don't translate, please !!!
Text = "Dummy 5";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SHAPES_POLYGONS
{
Text [ en-US ] = "Shapes - polygons";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SHAPES_1
{
Text [ en-US ] = "Shapes 1";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SHAPES_2
{
Text [ en-US ] = "Shapes 2";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ANIMALS
{
Text [ en-US ] = "Animals";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CARS
{
Text [ en-US ] = "Cars";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_BUGS
{
Text [ en-US ] = "Bugs";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CISCO_OTHER
{
Text [ en-US ] = "Cisco - Other";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CISCO_MEDIA
{
Text [ en-US ] = "Cisco - Media";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CISCO_PRODUCTS
{
Text [ en-US ] = "Cisco - Products";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CISCO_WAN_LAN
{
Text [ en-US ] = "Cisco - WAN - LAN";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_DOMINO_USUAL
{
Text [ en-US ] = "Domino - usual";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_DOMINO_NUMBERED
{
Text [ en-US ] = "Domino - numbered";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_1
{
Text [ en-US ] = "Electronics - parts 1";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_2
{
Text [ en-US ] = "Electronics - parts 2";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_3
{
Text [ en-US ] = "Electronics - parts 3";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_PARTS_4
{
Text [ en-US ] = "Electronics - parts 4";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_CIRCUIT
{
Text [ en-US ] = "Electronics - circuit";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_SIGNS
{
Text [ en-US ] = "Electronics - signs";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELECTRONICS_GAUGES
{
Text [ en-US ] = "Electronics - gauges";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PEOPLE_1
{
Text [ en-US ] = "People";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARCHITECTURE_OVERLAY
{
Text [ en-US ] = "Architecture - overlay";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARCHITECTURE_FURNITURES
{
Text [ en-US ] = "Architecture - furnitures";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARCHITECTURE_BUILDINGS
{
Text [ en-US ] = "Architecture - buildings";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARCHITECTURE_BATHROOM_KITCHEN
{
Text [ en-US ] = "Architecture - bathroom, kitchen";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARCHITECTURE_KITCHEN
{
Text [ en-US ] = "Architecture - kitchen";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARCHITECTURE_WINDOWS_DOORS
{
Text [ en-US ] = "Architecture - windows, doors";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FLOWCHARTS_1
{
Text [ en-US ] = "Flowcharts";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FLOWCHARTS_2
{
Text [ en-US ] = "Flowcharts 2";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FORALSTUDIOA
{
Text [ en-US ] = "Foral-StudioA";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_FAUNA
{
Text [ en-US ] = "Photos - Fauna";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_BUILDINGS
{
Text [ en-US ] = "Photos - Buildings";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_PLANTS
{
Text [ en-US ] = "Photos - Plants";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_STATUES
{
Text [ en-US ] = "Photos - Statues";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_LANDSCAPES
{
Text [ en-US ] = "Photos - Landscapes";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_CITIES
{
Text [ en-US ] = "Photos - Cities";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_FLOWERS
{
Text [ en-US ] = "Photos - Flowers";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_THERAPEUTICS_GENERAL
{
Text [ en-US ] = "Therapeutics - general";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_WEATHER
{
Text [ en-US ] = "Weather";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_VECHILES
{
Text [ en-US ] = "Vehicles";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SIGNS
{
Text [ en-US ] = "Signs";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_BLUE_MAN
{
Text [ en-US ] = "Blue Man";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CHEMISTRY_AMINO_ACIDS
{
Text [ en-US ] = "Chemistry - Amino acids";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_LOGICAL_SIGNS
{
Text [ en-US ] = "Logical signs";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_LOGICAL_GATES
{
Text [ en-US ] = "Logical gates";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_LOGOS
{
Text [ en-US ] = "Logos";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SMILES
{
Text [ en-US ] = "Smilies";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ARROWS_1
{
Text [ en-US ] = "Arrows";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_01_CLOCK
{
Text [ en-US ] = "Clock - 01 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_02_CLOCK
{
Text [ en-US ] = "Clock - 02 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_03_CLOCK
{
Text [ en-US ] = "Clock - 03 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_04_CLOCK
{
Text [ en-US ] = "Clock - 04 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_05_CLOCK
{
Text [ en-US ] = "Clock - 05 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_06_CLOCK
{
Text [ en-US ] = "Clock - 06 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_07_CLOCK
{
Text [ en-US ] = "Clock - 07 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_08_CLOCK
{
Text [ en-US ] = "Clock - 08 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_09_CLOCK
{
Text [ en-US ] = "Clock - 09 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_10_CLOCK
{
Text [ en-US ] = "Clock - 10 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_11_CLOCK
{
Text [ en-US ] = "Clock - 11 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CLOCK_12_CLOCK
{
Text [ en-US ] = "Clock - 12 clock";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PNEUMATIC_PARTS
{
Text [ en-US ] = "Pneumatic - parts";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMPUTER_GENERAL
{
Text [ en-US ] = "Computer - general";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMPUTER_NETWORK
{
Text [ en-US ] = "Computer - network";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMPUTER_NETWORK_DEVICES
{
Text [ en-US ] = "Computer - network devices";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_COMPUTER_WIFI
{
Text [ en-US ] = "Computer - WIFI";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_NUMBERS
{
Text [ en-US ] = "Numbers";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SIGNS_DANGER
{
Text [ en-US ] = "Signs - danger";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_OBJECTS
{
Text [ en-US ] = "Objects";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_AFRICA
{
Text [ en-US ] = "Maps - Africa";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_UNITED_STATES_OF_AMERICA
{
Text [ en-US ] = "Maps - United States of America";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_AUSTRALIA
{
Text [ en-US ] = "Maps - Australia";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_ASIA
{
Text [ en-US ] = "Maps - Asia";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_SOUTH_AMERICA
{
Text [ en-US ] = "Maps - South America";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_EUROPE
{
Text [ en-US ] = "Maps - Europe";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_EUROPE_1
{
Text [ en-US ] = "Maps - Europe 1";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_FRANCE
{
Text [ en-US ] = "Maps - France";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_FRANCE_COUNTRIES
{
Text [ en-US ] = "Maps - France - countries";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_SIGNS
{
Text [ en-US ] = "Maps - signs";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_CANADA
{
Text [ en-US ] = "Maps - Canada";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_CONTINENTS
{
Text [ en-US ] = "Maps - Continents";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_MIDDLE_EAST
{
Text [ en-US ] = "Maps - Middle East";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_MIDDLE_AMERICA
{
Text [ en-US ] = "Maps - Middle America";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_MIDDLE_AGES
{
Text [ en-US ] = "Maps - Middle ages";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_MEXICO
{
Text [ en-US ] = "Maps - Mexico";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_ANCIENT_TIMES
{
Text [ en-US ] = "Maps - Ancient times";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_SYMBOLS
{
Text [ en-US ] = "Maps - symbols";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_HISTORY_1900
{
Text [ en-US ] = "Maps - history - 1900";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MAPS_WORLD
{
Text [ en-US ] = "Maps - World";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_CROPS
{
Text [ en-US ] = "Crops";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FRACTIONS
{
Text [ en-US ] = "Fractions";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_FLAGS_1
{
Text [ en-US ] = "Flags";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MUSIC_INSTRUMENTS
{
Text [ en-US ] = "Music - instruments";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_MUSIC_SHEET_MUSIC
{
Text [ en-US ] = "Music - sheet music";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_SPECIAL_PICTOGRAMM
{
Text [ en-US ] = "Special Pictogramms";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_CELEBRATION
{
Text [ en-US ] = "Photos - Celebration";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_FOODSANDDRINKS
{
Text [ en-US ] = "Photos - Foods and Drinks";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_HUMANS
{
Text [ en-US ] = "Photos - Humans";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_OBJECTS
{
Text [ en-US ] = "Photos - Objects";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_SPACE
{
Text [ en-US ] = "Photos - Space";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_PHOTOS_TRAVEL
{
Text [ en-US ] = "Photos - Travel";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_OPENOFFICEORG_LOGOS
{
Text [ en-US ] = "OpenOffice.org logos";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_RELIGION
{
Text [ en-US ] = "Religion";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_BUILDINGS
{
Text [ en-US ] = "Buildings";
};
-// ---------------------------------------------------------------------------+
-
String RID_GALLERYSTR_THEME_HOMEPAGE2
{
Text [ en-US ] = "Homepage 2";
};
-// ---------------------------------------------------------------------------
-
String RID_GALLERYSTR_THEME_ELEMENTSBULLETS2
{
Text [ en-US ] = "Bullets 2";
};
-// ---------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list