[Libreoffice-commits] core.git: sc/source
Sven Wehner
wehner at informatik.uni-freiburg.de
Tue Jan 28 00:29:35 PST 2014
sc/source/ui/pagedlg/tptable.cxx | 79 +++++----------------------------------
1 file changed, 11 insertions(+), 68 deletions(-)
New commits:
commit 3fdbaaeebf4b03b57c5445f64888722a552de5dc
Author: Sven Wehner <wehner at informatik.uni-freiburg.de>
Date: Tue Jan 28 09:22:26 2014 +0100
fdo#39468 Translate German comments (sc/source/ui/pagedlg/tptable.cxx)
Also remove some ASCII art.
Change-Id: I8d440a05626c4db3ff63108a7e92ba54615ea24b
Reviewed-on: https://gerrit.libreoffice.org/7712
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 983c913..fd93283 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -17,13 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#undef SC_DLLIMPLEMENTATION
-
-
-//------------------------------------------------------------------
-
#include "scitems.hxx"
#include "tptable.hxx"
@@ -34,7 +29,7 @@
#include "pagedlg.hrc"
-// STATIC DATA -----------------------------------------------------------
+// Static Data
static sal_uInt16 pPageTableRanges[] =
{
@@ -69,7 +64,6 @@ static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich,
sal_Bool bIsChecked,
sal_Bool bSavedValue );
-//------------------------------------------------------------------------
#define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl)
#define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl)
@@ -85,7 +79,6 @@ static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich,
#define SC_TPTABLE_SCALE_TO 1
#define SC_TPTABLE_SCALE_TO_PAGES 2
-//========================================================================
ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
@@ -124,8 +117,6 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
}
-// -----------------------------------------------------------------------
-
void ScTablePage::ShowImage()
{
Image aImg = Image( ScResId( (m_pBtnLeftRight->IsChecked()) ? IMG_LEFTRIGHT : IMG_TOPDOWN ) );
@@ -133,36 +124,26 @@ void ScTablePage::ShowImage()
m_pBmpPageDir->SetOutputSizePixel( aImg.GetSizePixel() );
}
-// -----------------------------------------------------------------------
-
ScTablePage::~ScTablePage()
{
}
-//------------------------------------------------------------------------
-
sal_uInt16* ScTablePage::GetRanges()
{
return pPageTableRanges;
}
-// -----------------------------------------------------------------------
-
SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet )
{
return ( new ScTablePage( pParent, rCoreSet ) );
}
-// -----------------------------------------------------------------------
-
void ScTablePage::Reset( const SfxItemSet& rCoreSet )
{
sal_Bool bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet );
sal_uInt16 nWhich = 0;
- //-----------
- // sal_Bool-Flags
- //-----------
+ // sal_Bool flags
m_pBtnNotes->Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) );
m_pBtnGrid->Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) );
m_pBtnHeaders->Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) );
@@ -171,25 +152,18 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
m_pBtnTopDown->Check( bTopDown );
m_pBtnLeftRight->Check( !bTopDown );
- //------------------
- // Erste Druckseite:
- //------------------
+ // first printed page:
sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet);
m_pBtnPageNo->Check( nPage != 0 );
m_pEdPageNo->SetValue( (nPage != 0) ? nPage : 1 );
PageNoHdl( NULL );
- //-------------------
- // Objektdarstellung:
- //-------------------
+ // object representation:
m_pBtnCharts->Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) );
m_pBtnObjects->Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) );
m_pBtnDrawings->Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) );
- //------------
- // Skalierung:
- //------------
-
+ // scaling:
nWhich = GetWhich(SID_SCATTR_PAGE_SCALE);
if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
{
@@ -235,7 +209,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
PageDirHdl( NULL );
ScaleHdl( NULL );
- // merken fuer FillItemSet
+ // remember for FillItemSet
m_pBtnFormulas->SaveValue();
m_pBtnNullVals->SaveValue();
m_pBtnNotes->SaveValue();
@@ -255,18 +229,13 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
m_pEdScalePageNum->SaveValue();
}
-// -----------------------------------------------------------------------
-
sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
{
const SfxItemSet& rOldSet = GetItemSet();
sal_uInt16 nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO);
sal_Bool bDataChanged = false;
- //-----------
- // sal_Bool-Flags
- //-----------
-
+ // sal_Bool flags
bDataChanged |= lcl_PutBoolItem( GetWhich(SID_SCATTR_PAGE_NOTES),
rCoreSet, rOldSet,
m_pBtnNotes->IsChecked(),
@@ -297,9 +266,7 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
m_pBtnNullVals->IsChecked(),
m_pBtnNullVals->GetSavedValue() != STATE_NOCHECK );
- //------------------
- // Erste Druckseite:
- //------------------
+ // first printed page:
sal_Bool bUseValue = m_pBtnPageNo->IsChecked();
if ( WAS_DEFAULT(nWhichPageNo,rOldSet)
@@ -319,10 +286,7 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
bDataChanged = sal_True;
}
- //-------------------
- // Objektdarstellung:
- //-------------------
-
+ // object representation:
bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_CHARTS),
rCoreSet, rOldSet, *m_pBtnCharts );
@@ -332,10 +296,7 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
bDataChanged |= lcl_PutVObjModeItem( GetWhich(SID_SCATTR_PAGE_DRAWINGS),
rCoreSet, rOldSet, *m_pBtnDrawings );
- //------------
- // Skalierung:
- //------------
-
+ // scaling:
if( !m_pEdScalePageWidth->GetValue() && !m_pEdScalePageHeight->GetValue() )
{
m_pLbScaleMode->SelectEntryPos( SC_TPTABLE_SCALE_PERCENT );
@@ -360,8 +321,6 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
return bDataChanged;
}
-//------------------------------------------------------------------------
-
int ScTablePage::DeactivatePage( SfxItemSet* pSetP )
{
if ( pSetP )
@@ -370,8 +329,6 @@ int ScTablePage::DeactivatePage( SfxItemSet* pSetP )
return LEAVE_PAGE;
}
-//------------------------------------------------------------------------
-
void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt )
{
if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
@@ -379,9 +336,7 @@ void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt )
SfxTabPage::DataChanged( rDCEvt );
}
-//------------------------------------------------------------------------
// Handler:
-//------------------------------------------------------------------------
IMPL_LINK_NOARG(ScTablePage, PageDirHdl)
{
@@ -389,8 +344,6 @@ IMPL_LINK_NOARG(ScTablePage, PageDirHdl)
return 0;
}
-//------------------------------------------------------------------------
-
IMPL_LINK( ScTablePage, PageNoHdl, CheckBox*, pBtn )
{
if ( m_pBtnPageNo->IsChecked() )
@@ -405,8 +358,6 @@ IMPL_LINK( ScTablePage, PageNoHdl, CheckBox*, pBtn )
return 0;
}
-//------------------------------------------------------------------------
-
IMPL_LINK_NOARG(ScTablePage, ScaleHdl)
{
// controls for Box "Reduce/enlarge"
@@ -421,9 +372,7 @@ IMPL_LINK_NOARG(ScTablePage, ScaleHdl)
return 0;
}
-//========================================================================
-// Hilfsfunktionen fuer FillItemSet:
-//========================================================================
+// Helper functions for FillItemSet:
static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich,
SfxItemSet& rCoreSet,
@@ -442,8 +391,6 @@ static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich,
return bDataChanged;
}
-//------------------------------------------------------------------------
-
static sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich,
SfxItemSet& rCoreSet,
const SfxItemSet& rOldSet,
@@ -463,8 +410,6 @@ static sal_Bool lcl_PutVObjModeItem( sal_uInt16 nWhich,
return bDataChanged;
}
-//------------------------------------------------------------------------
-
static sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich,
SfxItemSet& rCoreSet,
const SfxItemSet& rOldSet,
@@ -516,6 +461,4 @@ static sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich,
return bDataChanged;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list