[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 8 commits - basic/source linguistic/source rsc/source sc/inc sc/qa sc/source sd/source sot/source
Kohei Yoshida
kohei.yoshida at gmail.com
Tue Mar 19 15:12:43 PDT 2013
Rebased ref, commits from common ancestor:
commit 25b6dcef4907cdf22456f7784f49860447ad9d1f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Mar 19 17:28:52 2013 -0400
More on removal of direct use of cell classes outside ScDocument.
Change-Id: Ie888b3494334613b5e4bcf97019b6dfbbd1a5da1
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index d8e4a38..1a1c9a4 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -428,6 +428,8 @@ public:
ScFormulaVectorState GetFormulaVectorState( SCROW nRow ) const;
+ void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
+
private:
const ScFormulaCell* FetchFormulaCell( SCROW nRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 91e003e..54c18ea 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -741,6 +741,8 @@ public:
bool TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam );
bool HasSubTotalCells( const ScRange& rRange );
+ SC_DLLPUBLIC void EnsureTable( SCTAB nTab );
+
SC_DLLPUBLIC void PutCell( const ScAddress&, ScBaseCell* pCell, bool bForceTab = false );
SC_DLLPUBLIC void PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell,
bool bForceTab = false );
@@ -763,7 +765,12 @@ public:
*/
SC_DLLPUBLIC void SetEditText( const ScAddress& rPos, EditTextObject* pEditText );
+ SC_DLLPUBLIC void SetEditText( const ScAddress& rPos, const OUString& rStr );
+
+ void SetEmptyCell( const ScAddress& rPos );
+
SC_DLLPUBLIC void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal );
+ SC_DLLPUBLIC void SetValue( const ScAddress& rPos, double fVal );
void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 nError);
SC_DLLPUBLIC void InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
@@ -790,6 +797,7 @@ public:
sal_uInt32& rFormat ) const;
sal_uInt32 GetNumberFormat( const ScRange& rRange ) const;
SC_DLLPUBLIC sal_uInt32 GetNumberFormat( const ScAddress& ) const;
+ void SetNumberFormat( const ScAddress& rPos, sal_uInt32 nNumberFormat );
/** If no number format attribute is set and the cell
pointer passed is of type formula cell, the calculated
number format of the formula cell is returned. pCell
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 988dea2..a210d5b 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -109,6 +109,8 @@ public:
static sal_Int32 SC_DLLPUBLIC GetQuotedTokenCount(const OUString &rIn, const OUString& rQuotedPairs, sal_Unicode cTok = ';' );
static OUString SC_DLLPUBLIC GetQuotedToken(const OUString &rIn, sal_Int32 nToken, const OUString& rQuotedPairs,
sal_Unicode cTok, sal_Int32& rIndex );
+
+ static bool SC_DLLPUBLIC isMultiline( const OUString& rStr );
};
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 990b0fc..98ca220 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -305,6 +305,8 @@ public:
void SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
+ void SetEmptyCell( SCCOL nCol, SCROW nRow );
+
void SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError);
@@ -509,14 +511,12 @@ public:
const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const;
const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
- sal_uLong GetNumberFormat( const ScAddress& rPos ) const
- {
- return ValidColRow(rPos.Col(),rPos.Row()) ?
- aCol[rPos.Col()].GetNumberFormat( rPos.Row() ) :
- 0;
- }
- sal_uLong GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
- sal_uInt32 GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
+ sal_uInt32 GetNumberFormat( const ScAddress& rPos ) const;
+ sal_uInt32 GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
+ sal_uInt32 GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
+
+ void SetNumberFormat( SCCOL nCol, SCROW nRow, sal_uInt32 nNumberFormat );
+
void MergeSelectionPattern( ScMergePatternState& rState,
const ScMarkData& rMark, bool bDeep ) const;
void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1,
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 17d951d..e2792de 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1537,6 +1537,16 @@ ScFormulaVectorState ScColumn::GetFormulaVectorState( SCROW nRow ) const
return pCell ? pCell->GetVectorState() : FormulaVectorUnknown;
}
+void ScColumn::SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat )
+{
+ short eOldType = pDocument->GetFormatTable()->GetType(
+ (sal_uLong)((SfxUInt32Item*)GetAttr(nRow, ATTR_VALUE_FORMAT))->GetValue());
+
+ short eNewType = pDocument->GetFormatTable()->GetType(nNumberFormat);
+ if (!pDocument->GetFormatTable()->IsCompatible(eOldType, eNewType))
+ ApplyAttr(nRow, SfxUInt32Item(ATTR_VALUE_FORMAT, nNumberFormat));
+}
+
const ScFormulaCell* ScColumn::FetchFormulaCell( SCROW nRow ) const
{
if (!ValidRow(nRow))
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c4c4ec6..36689bf 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -129,14 +129,7 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
void ScColumn::Insert( SCROW nRow, sal_uInt32 nNumberFormat, ScBaseCell* pCell )
{
Insert(nRow, pCell);
- short eOldType = pDocument->GetFormatTable()->
- GetType( (sal_uLong)
- ((SfxUInt32Item*)GetAttr( nRow, ATTR_VALUE_FORMAT ))->
- GetValue() );
- short eNewType = pDocument->GetFormatTable()->GetType(nNumberFormat);
- if (!pDocument->GetFormatTable()->IsCompatible(eOldType, eNewType))
- ApplyAttr( nRow, SfxUInt32Item( ATTR_VALUE_FORMAT, (sal_uInt32) nNumberFormat) );
-
+ SetNumberFormat(nRow, nNumberFormat);
bDirtyGroups = true;
}
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 1516996..167290b 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -24,8 +24,8 @@
#include "dbdocutl.hxx"
#include "document.hxx"
-#include "cell.hxx"
#include "formula/errorcodes.hxx"
+#include "stringutil.hxx"
using namespace ::com::sun::star;
@@ -153,38 +153,45 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB
nFormatIndex = pDoc->GetFormatTable()->GetStandardFormat(
NUMBERFORMAT_CURRENCY, ScGlobal::eLnge );
- ScBaseCell* pCell;
+ ScAddress aPos(nCol, nRow, nTab);
if (bEmptyFlag)
- {
- pCell = NULL;
- pDoc->PutCell( nCol, nRow, nTab, pCell );
- }
+ pDoc->SetEmptyCell(aPos);
else if (bError)
{
pDoc->SetError( nCol, nRow, nTab, NOTAVAILABLE );
}
else if (bValue)
{
- pCell = new ScValueCell( nVal );
- if (nFormatIndex == 0)
- pDoc->PutCell( nCol, nRow, nTab, pCell );
- else
- pDoc->PutCell( nCol, nRow, nTab, pCell, nFormatIndex );
+ pDoc->SetValue(aPos, nVal);
+ if (nFormatIndex)
+ pDoc->SetNumberFormat(aPos, nFormatIndex);
}
else
{
if (aString.Len())
{
- pCell = ScBaseCell::CreateTextCell( aString, pDoc );
- if (pStrData)
+ if (ScStringUtil::isMultiline(aString))
{
- pStrData->mbSimpleText = pCell->GetCellType() != CELLTYPE_EDIT;
- pStrData->mnStrLength = aString.Len();
+ pDoc->SetEditText(aPos, aString);
+ if (pStrData)
+ pStrData->mbSimpleText = false;
}
+ else
+ {
+ ScSetStringParam aParam;
+ aParam.mbDetectNumberFormat = false;
+ aParam.mbHandleApostrophe = false;
+ aParam.meSetTextNumFormat = ScSetStringParam::Always;
+ pDoc->SetString(aPos, aString, &aParam);
+ if (pStrData)
+ pStrData->mbSimpleText = true;
+ }
+
+ if (pStrData)
+ pStrData->mnStrLength = aString.Len();
}
else
- pCell = NULL;
- pDoc->PutCell( nCol, nRow, nTab, pCell );
+ pDoc->SetEmptyCell(aPos);
}
}
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 64eb25a..bc681ba 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -574,6 +574,16 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab )
}
}
+void ScDocument::EnsureTable( SCTAB nTab )
+{
+ bool bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags
+ if (static_cast<size_t>(nTab) >= maTabs.size())
+ maTabs.resize(nTab+1, NULL);
+
+ if (!maTabs[nTab])
+ maTabs[nTab] = new ScTable(this, nTab, "temp", bExtras, bExtras);
+}
+
void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
ScBaseCell* pCell, sal_uLong nFormatIndex, bool bForceTab )
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 71f4a1f..455178a 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -86,6 +86,7 @@
#include "clipparam.hxx"
#include "stlalgorithm.hxx"
#include "defaultsoptions.hxx"
+#include "editutil.hxx"
#include <map>
#include <limits>
@@ -2979,6 +2980,24 @@ void ScDocument::SetEditText( const ScAddress& rPos, EditTextObject* pEditText )
maTabs[rPos.Tab()]->SetEditText(rPos.Col(), rPos.Row(), pEditText);
}
+void ScDocument::SetEditText( const ScAddress& rPos, const OUString& rStr )
+{
+ if (!TableExists(rPos.Tab()))
+ return;
+
+ ScFieldEditEngine& rEngine = GetEditEngine();
+ rEngine.SetText(rStr);
+ maTabs[rPos.Tab()]->SetEditText(rPos.Col(), rPos.Row(), rEngine.CreateTextObject());
+}
+
+void ScDocument::SetEmptyCell( const ScAddress& rPos )
+{
+ if (!TableExists(rPos.Tab()))
+ return;
+
+ maTabs[rPos.Tab()]->SetEmptyCell(rPos.Col(), rPos.Row());
+}
+
void ScDocument::SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal )
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()))
@@ -2986,6 +3005,14 @@ void ScDocument::SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVa
maTabs[nTab]->SetValue( nCol, nRow, rVal );
}
+void ScDocument::SetValue( const ScAddress& rPos, double fVal )
+{
+ if (!TableExists(rPos.Tab()))
+ return;
+
+ maTabs[rPos.Tab()]->SetValue(rPos.Col(), rPos.Row(), fVal);
+}
+
OUString ScDocument::GetString( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
@@ -3140,6 +3167,13 @@ sal_uInt32 ScDocument::GetNumberFormat( const ScAddress& rPos ) const
return 0;
}
+void ScDocument::SetNumberFormat( const ScAddress& rPos, sal_uInt32 nNumberFormat )
+{
+ if (!TableExists(rPos.Tab()))
+ return;
+
+ maTabs[rPos.Tab()]->SetNumberFormat(rPos.Col(), rPos.Row(), nNumberFormat);
+}
void ScDocument::GetNumberFormatInfo( short& nType, sal_uLong& nIndex,
const ScAddress& rPos, const ScBaseCell* pCell ) const
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 015fa67..80cc8cb 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1334,6 +1334,14 @@ void ScTable::SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText )
aCol[nCol].SetEditText(nRow, pEditText);
}
+void ScTable::SetEmptyCell( SCCOL nCol, SCROW nRow )
+{
+ if (!ValidColRow(nCol, nRow))
+ return;
+
+ aCol[nCol].Delete(nRow);
+}
+
void ScTable::SetValue( SCCOL nCol, SCROW nRow, const double& rVal )
{
if (ValidColRow(nCol, nRow))
@@ -1615,8 +1623,14 @@ const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, sal_uInt16 nWhich )
return NULL;
}
+sal_uInt32 ScTable::GetNumberFormat( const ScAddress& rPos ) const
+{
+ return ValidColRow(rPos.Col(),rPos.Row()) ?
+ aCol[rPos.Col()].GetNumberFormat( rPos.Row() ) :
+ 0;
+}
-sal_uLong ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
+sal_uInt32 ScTable::GetNumberFormat( SCCOL nCol, SCROW nRow ) const
{
if (ValidColRow(nCol,nRow))
return aCol[nCol].GetNumberFormat( nRow );
@@ -1632,6 +1646,13 @@ sal_uInt32 ScTable::GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow
return aCol[nCol].GetNumberFormat(nStartRow, nEndRow);
}
+void ScTable::SetNumberFormat( SCCOL nCol, SCROW nRow, sal_uInt32 nNumberFormat )
+{
+ if (!ValidColRow(nCol, nRow))
+ return;
+
+ aCol[nCol].SetNumberFormat(nRow, nNumberFormat);
+}
const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const
{
diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx
index 14ea674..8924eca 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -20,9 +20,7 @@
#include "stringutil.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/math.hxx"
-
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
+#include "global.hxx"
ScSetStringParam::ScSetStringParam() :
mpNumFormatter(NULL),
@@ -310,4 +308,15 @@ OUString ScStringUtil::GetQuotedToken(const OUString &rIn, sal_Int32 nToken, con
}
}
+bool ScStringUtil::isMultiline( const OUString& rStr )
+{
+ if (rStr.indexOf('\n') != -1)
+ return true;
+
+ if (rStr.indexOf(CHAR_CR) != -1)
+ return true;
+
+ return false;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index a6864c7..63987e7 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -23,7 +23,6 @@
#include <svl/zforlist.hxx>
#include "attrib.hxx"
-#include "cell.hxx"
#include "dif.hxx"
#include "docpool.hxx"
#include "document.hxx"
@@ -33,6 +32,7 @@
#include "patattr.hxx"
#include "scerrors.hxx"
#include "scitems.hxx"
+#include "stringutil.hxx"
const sal_Unicode pKeyTABLE[] = { 'T', 'A', 'B', 'L', 'E', 0 };
const sal_Unicode pKeyVECTORS[] = { 'V', 'E', 'C', 'T', 'O', 'R', 'S', 0 };
@@ -53,16 +53,16 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
{
DifParser aDifParser( rIn, nDifOption, *pDoc, eVon );
- const sal_Bool bPlain = aDifParser.IsPlain();
+ const bool bPlain = aDifParser.IsPlain();
SCTAB nBaseTab = rInsPos.Tab();
TOPIC eTopic = T_UNKNOWN;
- sal_Bool bSyntErrWarn = false;
- sal_Bool bOverflowWarn = false;
+ bool bSyntErrWarn = false;
+ bool bOverflowWarn = false;
rtl::OUString aData = aDifParser.aData;
- sal_Bool bData = false;
+ bool bData = false;
rIn.Seek( 0 );
@@ -133,14 +133,20 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
DATASET eAkt = D_UNKNOWN;
+ ScSetStringParam aStrParam; // used to set string value without number detection.
+ aStrParam.mbDetectNumberFormat = false;
+ aStrParam.mbHandleApostrophe = false;
+ aStrParam.meSetTextNumFormat = ScSetStringParam::Always;
+
while( eAkt != D_EOD )
- {
+ {
eAkt = aDifParser.GetNextDataset();
aPrgrsBar.Progress();
+ ScAddress aPos(nColCnt, nRowCnt, nBaseTab);
switch( eAkt )
- {
+ {
case D_BOT:
if( nColCnt < SCCOL_MAX )
nRowCnt++;
@@ -154,17 +160,18 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
if( ValidCol(nColCnt) && ValidRow(nRowCnt) )
{
- ScBaseCell* pCell;
+ pDoc->EnsureTable(nBaseTab);
+
if( DifParser::IsV( aData.getStr() ) )
{
- pCell = new ScValueCell( aDifParser.fVal );
+ pDoc->SetValue(aPos, aDifParser.fVal);
if( !bPlain )
aAttrCache.SetNumFormat( nColCnt, nRowCnt,
aDifParser.nNumFormat );
}
else if( aData == pKeyTRUE || aData == pKeyFALSE )
{
- pCell = new ScValueCell( aDifParser.fVal );
+ pDoc->SetValue(aPos, aDifParser.fVal);
if( bPlain )
aAttrCache.SetLogical( nColCnt, nRowCnt );
else
@@ -172,19 +179,19 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
aDifParser.nNumFormat );
}
else if( aData == pKeyNA || aData == pKeyERROR )
- pCell = new ScStringCell( aData );
+ {
+ pDoc->SetString(aPos, aData, &aStrParam);
+ }
else
{
String aTmp( RTL_CONSTASCII_USTRINGPARAM( "#IND: " ));
aTmp += aData;
aTmp += sal_Unicode('?');
- pCell = new ScStringCell( aTmp );
+ pDoc->SetString(aPos, aTmp, &aStrParam);
}
-
- pDoc->PutCell( nColCnt, nRowCnt, nBaseTab, pCell, true );
}
else
- bOverflowWarn = sal_True;
+ bOverflowWarn = true;
nColCnt++;
break;
@@ -196,8 +203,12 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
{
if (!aData.isEmpty())
{
- pDoc->PutCell( nColCnt, nRowCnt, nBaseTab,
- ScBaseCell::CreateTextCell( aData, pDoc ), true );
+ pDoc->EnsureTable(nBaseTab);
+
+ if (ScStringUtil::isMultiline(aData))
+ pDoc->SetEditText(aPos, aData);
+ else
+ pDoc->SetString(aPos, aData, &aStrParam);
}
}
else
commit 5f0ad2a5ac6a5c4533bb68b3a78af394ad7b21f6
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 19 23:01:16 2013 +0100
windows build fix
Change-Id: I6ff724052660d73b583fb1e44265a60a6fa4379f
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 579a719..0318b82 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2930,7 +2930,7 @@ RTLFUNC(GetAttr)
{
OUString aPathURL = getFullPath( rPar.Get(1)->GetOUString() );
OUString aPath;
- getSystemPathFromFileURL( aPathURL, aPath );
+ FileBase::getSystemPathFromFileURL( aPathURL, aPath );
OString aSystemPath(OUStringToOString(aPath, osl_getThreadTextEncoding()));
DWORD nRealFlags = GetFileAttributes (aSystemPath.getStr());
if (nRealFlags != 0xffffffff)
commit 332a93435fc5757532d0b93b38aaf9fe1c9ca0f5
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 19 22:55:56 2013 +0100
fdo#39445 writing out tools/fsys.hxx (linguistic)
Change-Id: I5d0e5ebbec46c32998962398da14ac81bb8afea8
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 6bfeb58..58872b7 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -22,7 +22,6 @@
#include <i18npool/lang.h>
#include <osl/mutex.hxx>
#include <tools/debug.hxx>
-#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 9fa05f4..a71ce6e 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -18,7 +18,6 @@
*/
-#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 7b6f71ea..7ddf38f 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -18,7 +18,6 @@
*/
#include <tools/debug.hxx>
-#include <tools/fsys.hxx>
#include <tools/string.hxx>
#include <i18npool/languagetag.hxx>
#include <tools/stream.hxx>
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 1752a56..4307d4c 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -25,7 +25,6 @@
#include <i18npool/languagetag.hxx>
#include <osl/mutex.hxx>
#include <tools/debug.hxx>
-#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 27ded13..6415298 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -21,7 +21,6 @@
#include <cppuhelper/factory.hxx>
#include <i18npool/mslangid.hxx>
#include <osl/file.hxx>
-#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <tools/urlobj.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 96cdc7e..71cc782 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -19,7 +19,6 @@
#include <unicode/uscript.h>
#include <i18npool/lang.h>
-#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
#include <osl/mutex.hxx>
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 333a6ff..f3d4159 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -19,7 +19,6 @@
#include <sal/macros.h>
#include <tools/string.hxx>
-#include <tools/fsys.hxx>
#include <tools/debug.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/lngmisc.hxx>
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index a4ef6d9..15b33ac 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -18,7 +18,6 @@
*/
#include <tools/string.hxx>
-#include <tools/fsys.hxx>
#include <tools/urlobj.hxx>
#include <ucbhelper/content.hxx>
#include <tools/debug.hxx>
commit 438efb38ec42f9c342342925236cf8ea1eada9fc
Author: Andras Timar <atimar at suse.com>
Date: Tue Mar 19 22:41:32 2013 +0100
fdo#39445 writing out tools/fsys.hxx (basic)
Change-Id: I2ec7546572fa72359615f371715b4aa82b1182ca
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index d63c7d3..b1ba55b2 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -458,12 +458,6 @@ OUString getFullPath( const OUString& aRelPath );
// has not to be infected with UNO)
void implStepRenameUCB( const OUString& aSource, const OUString& aDest );
-//*** OSL file access ***
-// #87427 OSL need File URLs, so map to getFullPath
-inline OUString getFullPathUNC( const OUString& aRelPath )
-{
- return getFullPath( aRelPath );
-}
void implStepRenameOSL( const OUString& aSource, const OUString& aDest );
bool IsBaseIndexOne();
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 750d7c3..579a719 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -38,11 +38,7 @@
#include "runtime.hxx"
#include "sbunoobj.hxx"
-#ifdef WNT
-#include <tools/fsys.hxx>
-#else
#include <osl/file.hxx>
-#endif
#include "errobject.hxx"
#include <comphelper/processfactory.hxx>
@@ -548,7 +544,7 @@ void implStepRenameUCB( const OUString& aSource, const OUString& aDest )
// Implementation of StepRENAME with OSL
void implStepRenameOSL( const OUString& aSource, const OUString& aDest )
{
- FileBase::RC nRet = File::move( getFullPathUNC( aSource ), getFullPathUNC( aDest ) );
+ FileBase::RC nRet = File::move( getFullPath( aSource ), getFullPath( aDest ) );
if( nRet != FileBase::E_None )
{
StarBASIC::Error( SbERR_PATH_NOT_FOUND );
@@ -582,7 +578,7 @@ RTLFUNC(FileCopy)
}
else
{
- FileBase::RC nRet = File::copy( getFullPathUNC( aSource ), getFullPathUNC( aDest ) );
+ FileBase::RC nRet = File::copy( getFullPath( aSource ), getFullPath( aDest ) );
if( nRet != FileBase::E_None )
{
StarBASIC::Error( SbERR_PATH_NOT_FOUND );
@@ -626,7 +622,7 @@ RTLFUNC(Kill)
}
else
{
- File::remove( getFullPathUNC( aFileSpec ) );
+ File::remove( getFullPath( aFileSpec ) );
}
}
else
@@ -662,7 +658,7 @@ RTLFUNC(MkDir)
}
else
{
- Directory::create( getFullPathUNC( aPath ) );
+ Directory::create( getFullPath( aPath ) );
}
}
else
@@ -774,7 +770,7 @@ RTLFUNC(RmDir)
}
else
{
- implRemoveDirRecursive( getFullPathUNC( aPath ) );
+ implRemoveDirRecursive( getFullPath( aPath ) );
}
}
else
@@ -840,7 +836,7 @@ RTLFUNC(FileLen)
else
{
DirectoryItem aItem;
- DirectoryItem::get( getFullPathUNC( aStr ), aItem );
+ DirectoryItem::get( getFullPath( aStr ), aItem );
FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
aItem.getFileStatus( aFileStatus );
nLen = (sal_Int32)aFileStatus.getFileSize();
@@ -2927,18 +2923,16 @@ RTLFUNC(GetAttr)
{
sal_Int16 nFlags = 0;
- // In Windows, We want to use Windows API to get the file attributes
+ // In Windows, we want to use Windows API to get the file attributes
// for VBA interoperability.
#if defined( WNT )
if( SbiRuntime::isVBAEnabled() )
{
- DirEntry aEntry( rPar.Get(1)->GetOUString() );
- aEntry.ToAbs();
-
- // #57064 extract the real-path for virtual URLs
- OString aByteStrFullPath(OUStringToOString(aEntry.GetFull(),
- osl_getThreadTextEncoding()));
- DWORD nRealFlags = GetFileAttributes (aByteStrFullPath.getStr());
+ OUString aPathURL = getFullPath( rPar.Get(1)->GetOUString() );
+ OUString aPath;
+ getSystemPathFromFileURL( aPathURL, aPath );
+ OString aSystemPath(OUStringToOString(aPath, osl_getThreadTextEncoding()));
+ DWORD nRealFlags = GetFileAttributes (aSystemPath.getStr());
if (nRealFlags != 0xffffffff)
{
if (nRealFlags == FILE_ATTRIBUTE_NORMAL)
@@ -2999,7 +2993,7 @@ RTLFUNC(GetAttr)
else
{
DirectoryItem aItem;
- DirectoryItem::get( getFullPathUNC( rPar.Get(1)->GetOUString() ), aItem );
+ DirectoryItem::get( getFullPath( rPar.Get(1)->GetOUString() ), aItem );
FileStatus aFileStatus( osl_FileStatus_Mask_Attributes | osl_FileStatus_Mask_Type );
aItem.getFileStatus( aFileStatus );
sal_uInt64 nAttributes = aFileStatus.getAttributes();
@@ -3059,7 +3053,7 @@ RTLFUNC(FileDateTime)
else
{
DirectoryItem aItem;
- DirectoryItem::get( getFullPathUNC( aPath ), aItem );
+ DirectoryItem::get( getFullPath( aPath ), aItem );
FileStatus aFileStatus( osl_FileStatus_Mask_ModifyTime );
aItem.getFileStatus( aFileStatus );
TimeValue aTimeVal = aFileStatus.getModifyTime();
@@ -3506,7 +3500,7 @@ RTLFUNC(Shell)
std::list<String>::const_iterator iter = aTokenList.begin();
const OUString& rStr = *iter;
OUString aOUStrProg( rStr.getStr(), rStr.getLength() );
- OUString aOUStrProgUNC = getFullPathUNC( aOUStrProg );
+ OUString aOUStrProgURL = getFullPath( aOUStrProg );
++iter;
@@ -3526,7 +3520,7 @@ RTLFUNC(Shell)
oslProcess pApp;
sal_Bool bSucc = osl_executeProcess(
- aOUStrProgUNC.pData,
+ aOUStrProgURL.pData,
pParamList,
nParamCount,
nOptions,
@@ -4583,7 +4577,7 @@ RTLFUNC(FileExists)
else
{
DirectoryItem aItem;
- FileBase::RC nRet = DirectoryItem::get( getFullPathUNC( aStr ), aItem );
+ FileBase::RC nRet = DirectoryItem::get( getFullPath( aStr ), aItem );
bExists = (nRet == FileBase::E_None);
}
rPar.Get(0)->PutBool( bExists );
commit b82f685101e56bf78edf0bb0d8848818e46b4544
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue Mar 19 22:25:43 2013 +0100
-Werror=format, "fix %d expects argument of type int"
Change-Id: I654d035bc79ba157c6fdd01edf7930ef05f7b970
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ec2711f..cd8cf1f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6268,7 +6268,7 @@ void Test::testFormulaGrouping()
if( !!pCur->GetCellGroup().get() ^ aGroupTests[i].bGroup[j] )
{
- printf("expected group test %d at row %d to be %d but is %d\n",
+ printf("expected group test %lu at row %lu to be %d but is %d\n",
i, j, aGroupTests[i].bGroup[j], !!pCur->GetCellGroup().get());
CPPUNIT_ASSERT_MESSAGE("Failed", false);
}
commit 6e7ec40523fa4822ff5f66ad112ffcea6e823b3a
Author: Urs Fässler <urs at bitzgi.ch>
Date: Tue Mar 19 22:24:19 2013 +0100
translation and cleanup of comments in sd/source/ui/view/
Change-Id: I988c0545600185c6b09131d27fb8480efddd947f
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 83fda37..b250e8a 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1984,7 +1984,7 @@ private:
continue;
MapMode aMap (rInfo.maMap);
- // Kann sich die Seitengroesse geaendert haben?
+ // is it possible that the page size changed?
const Size aPageSize = pPage->GetSize();
if (mpOptions->IsPageSize())
@@ -2014,9 +2014,10 @@ private:
long aPageWidth = aPageSize.Width() - pPage->GetLftBorder() - pPage->GetRgtBorder();
long aPageHeight = aPageSize.Height() - pPage->GetUppBorder() - pPage->GetLwrBorder();
- // Bugfix zu 44530:
- // Falls implizit umgestellt wurde (Landscape/Portrait)
- // wird dies beim Kacheln, bzw. aufteilen (Poster) beruecksichtigt
+ // Bugfix for 44530:
+ // if it was implicitly changed (Landscape/Portrait),
+ // this is considered for tiling, respectively for the splitting up
+ // (Poster)
if( ( rInfo.maPrintSize.Width() > rInfo.maPrintSize.Height()
&& aPageWidth < aPageHeight )
|| ( rInfo.maPrintSize.Width() < rInfo.maPrintSize.Height()
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index b2ab27d..508a1b6 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -126,12 +126,6 @@ private:
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
: SdrOutliner( &pDoc->GetItemPool(), nMode ),
mpImpl(new Implementation()),
@@ -410,12 +404,9 @@ sal_Bool Outliner::SpellNextDocument (void)
}
-/*************************************************************************
-|*
-|* Spelling: naechstes TextObjekt pruefen
-|*
-\************************************************************************/
-
+/**
+ * check next text object
+ */
::svx::SpellPortions Outliner::GetNextSpellSentence (void)
{
::svx::SpellPortions aResult;
@@ -1385,12 +1376,9 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus)
-/*************************************************************************
-|*
-|* SpellChecker: Error-LinkHdl
-|*
-\************************************************************************/
-
+/**
+ * SpellChecker: Error link handler
+ */
IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang )
{
mbError = true;
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index 6aa095b..4abd08f 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -155,7 +155,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet)
switch (eSegm)
{
case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break;
- case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button reingedrueckt = Kurve
+ case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button down = curve
case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break;
default: break;
}
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 4163ff1..2d6b18a 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -148,7 +148,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
SfxItemSet aAttr( pStyleSheet->GetItemSet() );
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( (sal_uInt16) nPara ) );
- aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems nicht als Default, sondern als "Loecher" betrachten
+ aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems is not default, handle it as "holes"
const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) aAttr.Get( EE_PARA_ULSPACE );
SvxULSpaceItem* pNewItem = (SvxULSpaceItem*) rItem.Clone();
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 10c5c62..e74f82c 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1009,7 +1009,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
SdPage* pMaster = GetDoc()->GetMasterSdPage(nSelectedPage, mePageKind);
- if( !pMaster ) // Falls es diese Page nicht geben sollte
+ if( !pMaster ) // if this page should not exist
pMaster = GetDoc()->GetMasterSdPage(0, mePageKind);
sal_uInt16 nNum = pMaster->GetPageNum();
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 2a73662..77a1c2a 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -90,16 +90,13 @@ using ::com::sun::star::frame::XController;
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer Controller bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * handle SfxRequests for controller
+ */
void DrawViewShell::ExecCtrl(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausser dem Seitenwechsel und dem
- // Sprung zur Bookmark ausgefuehrt!
+ // except a page switch and jumps to bookmarks, nothing is executed during
+ // a slide show
if( HasCurrentFunction(SID_PRESENTATION) &&
rReq.GetSlot() != SID_SWITCHPAGE &&
rReq.GetSlot() != SID_JUMPTOMARK)
@@ -236,7 +233,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
}
- // Default-Layer der Page einschalten
+ // turn on default layer of page
mpDrawView->SetActiveLayer( String( SdResId(STR_LAYER_LAYOUT) ) );
ChangeEditMode(EM_PAGE, mbIsLayerModeActive);
@@ -313,9 +310,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
case SID_OBJECTRESIZE:
{
- /******************************************************************
- * Der Server moechte die Clientgrosse verandern
- ******************************************************************/
+ // The server likes to change the client size
OSL_ASSERT (GetViewShell()!=NULL);
SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient();
@@ -374,7 +369,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
p3DWin->DocumentReload();
}
- // Normale Weiterleitung an ViewFrame zur Ausfuehrung
+ // normal forwarding to ViewFrame for execution
GetViewFrame()->ExecuteSlot(rReq);
// From here on we must cope with this object and the frame already being
@@ -466,15 +461,10 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* SfxRequests fuer Lineale bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecRuler(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -750,16 +740,12 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
}
}
if ( pUndoGroup )
- // Undo Gruppe dem Undo Manager uebergeben
+ // give the undo group to the undo manager
GetViewFrame()->GetObjectShell()->GetUndoManager()->
AddUndoAction(pUndoGroup);
}
-/*************************************************************************
-|*
-|* Statuswerte der Lineale bestimmen
-|*
-\************************************************************************/
+
void DrawViewShell::GetRulerState(SfxItemSet& rSet)
{
Point aOrigin;
@@ -868,7 +854,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.DisableItem( SID_RULER_OBJECT );
- // Seitenraender werden gelocked
+ // lock page margins
aProtect.SetSizeProtect( sal_True );
aProtect.SetPosProtect( sal_True );
}
@@ -914,15 +900,10 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.Put( aProtect );
}
-/*************************************************************************
-|*
-|* SfxRequests fuer StatusBar bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecStatusBar(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -944,12 +925,9 @@ void DrawViewShell::ExecStatusBar(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* Status der Snap-Objekt-Eintraege im Popup setzen
-|*
-\************************************************************************/
-
+/**
+ * set state of snap object entries in popup
+ */
void DrawViewShell::GetSnapItemState( SfxItemSet &rSet )
{
SdrPageView* pPV;
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index c3511c9..e360345 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -71,11 +71,6 @@ namespace sd {
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing;
-/*************************************************************************
-|*
-|* aktuelle Seite loeschen
-|*
-\************************************************************************/
void DrawViewShell::DeleteActualPage()
{
@@ -96,11 +91,6 @@ void DrawViewShell::DeleteActualPage()
}
}
-/*************************************************************************
-|*
-|* aktuelle Ebene loeschen
-|*
-\************************************************************************/
void DrawViewShell::DeleteActualLayer()
{
@@ -108,7 +98,7 @@ void DrawViewShell::DeleteActualLayer()
const String& rName = GetLayerTabControl()->GetPageText(GetLayerTabControl()->GetCurPageId());
String aString(SdResId(STR_ASK_DELETE_LAYER));
- // Platzhalter ersetzen
+ // replace placeholder
sal_uInt16 nPos = aString.Search(sal_Unicode('$'));
aString.Erase(nPos, 1);
aString.Insert(rName, nPos);
@@ -118,22 +108,16 @@ void DrawViewShell::DeleteActualLayer()
const SdrLayer* pLayer = rAdmin.GetLayer(rName, sal_False);
mpDrawView->DeleteLayer( pLayer->GetName() );
- // damit TabBar und Window neu gezeichnet werden;
- // sollte spaeter wie beim Aendern der Layerfolge durch einen
- // Hint von Joe angestossen werden
+ /* in order to redraw TabBar and Window; should be initiated later on by
+ a hint from Joe (as by a change if the layer order). */
// ( View::Notify() --> ViewShell::ResetActualLayer() )
- mbIsLayerModeActive = false; // damit ChangeEditMode() ueberhaupt was tut
+ mbIsLayerModeActive = false; // so that ChangeEditMode() does something
ChangeEditMode(GetEditMode(), true);
}
}
-/*************************************************************************
-|*
-|* Keyboard event
-|*
-\************************************************************************/
sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
{
@@ -213,12 +197,9 @@ sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
return bRet;
}
-/*************************************************************************
-|*
-|* Vom Lineal ausgehenden Drag (Hilflinien, Ursprung) beginnen
-|*
-\************************************************************************/
-
+/**
+ * Start with Drag from ruler (helper lines, origin)
+ */
void DrawViewShell::StartRulerDrag (
const Ruler& rRuler,
const MouseEvent& rMEvt)
@@ -252,11 +233,6 @@ void DrawViewShell::StartRulerDrag (
}
}
-/*************************************************************************
-|*
-|* MouseButtonDown event
-|*
-\************************************************************************/
void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
::sd::Window* pWin)
@@ -282,11 +258,6 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
}
}
-/*************************************************************************
-|*
-|* MouseMove event
-|*
-\************************************************************************/
void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
@@ -397,11 +368,6 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
}
-/*************************************************************************
-|*
-|* MouseButtonUp event
-|*
-\************************************************************************/
void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
@@ -441,11 +407,6 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
}
}
-/*************************************************************************
-|*
-|* Command event
-|*
-\************************************************************************/
void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
{
@@ -501,38 +462,38 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
else if( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && !bNativeShow &&
pWin != NULL && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() )
{
- sal_uInt16 nSdResId = 0; // ResourceID fuer Popup-Menue
+ sal_uInt16 nSdResId = 0; // ResourceID for popup menu
sal_Bool bGraphicShell = this->ISA(GraphicViewShell);
- // Ist ein Fangobjekt unter dem Mauszeiger?
+ // is there a snap object under the cursor?
SdrPageView* pPV;
Point aMPos = pWin->PixelToLogic( maMousePos );
sal_uInt16 nHitLog = (sal_uInt16) GetActiveWindow()->PixelToLogic(
Size(FuPoor::HITPIX, 0 ) ).Width();
sal_uInt16 nHelpLine;
- // fuer Klebepunkt
+ // for glue points
SdrObject* pObj = NULL;
sal_uInt16 nPickId = 0;
- // fuer Feldbefehl
+ // for field command
OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView();
const SvxFieldItem* pFldItem = NULL;
if( pOLV )
pFldItem = pOLV->GetFieldAtSelection();
- // Hilfslinie
+ // helper line
if ( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) )
{
nSdResId = RID_DRAW_SNAPOBJECT_POPUP;
ShowSnapLineContextMenu(*pPV, nHelpLine, rCEvt.GetMousePosPixel());
return;
}
- // Klebepunkt unter dem Mauszeiger markiert?
+ // is glue point under cursor marked?
else if( mpDrawView->PickGluePoint( aMPos, pObj, nPickId, pPV ) &&
mpDrawView->IsGluePointMarked( pObj, nPickId ) )
{
nSdResId = RID_DRAW_GLUEPOINT_POPUP;
}
- // Feldbefehl ?
+ // field command?
else if( pFldItem && (pFldItem->GetField()->ISA( SvxDateField ) ||
pFldItem->GetField()->ISA( SvxExtTimeField ) ||
pFldItem->GetField()->ISA( SvxExtFileField ) ||
@@ -559,7 +520,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
- // Feld selektieren, so dass es beim Insert geloescht wird
+ // select field, so that it will be deleted on insert
ESelection aSel = pOLV->GetSelection();
sal_Bool bSel = sal_True;
if( aSel.nStartPos == aSel.nEndPos )
@@ -571,7 +532,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
pOLV->InsertField( aFieldItem );
- // Selektion wird wieder in den Ursprungszustand gebracht
+ // reset selection back to original state
if( !bSel )
aSel.nEndPos--;
pOLV->SetSelection( aSel );
@@ -581,7 +542,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
else
{
- // ist etwas selektiert?
+ // is something selected?
if (mpDrawView->AreObjectsMarked() &&
mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 )
{
@@ -740,7 +701,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
}
- // Mehrfachselektion
+ // multiple selection
else if (mpDrawView->AreObjectsMarked() &&
mpDrawView->GetMarkedObjectList().GetMarkCount() > 1 )
{
@@ -748,7 +709,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
RID_DRAW_MULTISELECTION_POPUP;
}
- // nichts selektiert
+ // nothing selected
else
{
nSdResId = bGraphicShell ? RID_GRAPHIC_NOSEL_POPUP :
@@ -801,11 +762,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
}
}
-/*************************************************************************
-|*
-|* Linealmarkierungen anzeigen
-|*
-\************************************************************************/
void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
::sd::Window* pWin)
@@ -857,7 +813,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
mpVerticalRuler->SetLines(nCnt, pVLines);
}
- // StatusBar Koordinatenanzeige
+ // display with coordinates in StatusBar
OSL_ASSERT (GetViewShell()!=NULL);
if ( !GetViewShell()->GetUIActiveClient() )
{
@@ -866,7 +822,7 @@ void DrawViewShell::ShowMousePosInfo(const Rectangle& rRect,
SID_ATTR_SIZE, SID_ATTR_SIZE,
0L);
-// GetStatusBarState(aSet); nicht performant bei gedrueckter Modifiertaste!!
+// GetStatusBarState(aSet); not fast by pressed modify key!!
aSet.Put( SfxStringItem( SID_CONTEXT, mpDrawView->GetStatusText() ) );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index c87d25b..3648561 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -69,24 +69,18 @@ static const int TABCONTROL_INITIAL_SIZE = 350;
static const int PAPER_SHADOW_EXT_PIXEL = 2;
-/*************************************************************************
-|*
-|* Wird gerufen, wenn sich das Model aendert
-|*
-\************************************************************************/
void DrawViewShell::ModelHasChanged()
{
Invalidate();
- // Damit der Navigator auch einen aktuellen Status bekommt
+ // that the navigator also gets an up to date state
GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False );
SfxBoolItem aItem( SID_3D_STATE, sal_True );
GetViewFrame()->GetDispatcher()->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
- // jetzt den von der Drawing Engine neu erzeugten TextEditOutliner
- // initialisieren
+ // now initialize the TextEditOutliner which was newly created by the draw engine
::Outliner* pOutliner = mpDrawView->GetTextEditOutliner();
if (pOutliner)
{
@@ -144,28 +138,25 @@ void DrawViewShell::ArrangeGUIElements (void)
if ( mbZoomOnPage && !bInPlaceActive && !bClientActive )
{
- // bei Split immer erstes Fenster resizen
+ // with split, always resize first window
//af pWindow = mpContentWindow.get();
SfxRequest aReq(SID_SIZE_PAGE, 0, GetDoc()->GetItemPool());
ExecuteSlot( aReq );
}
}
-/*************************************************************************
-|*
-|* Daten der FrameView auf die aktuelle View uebertragen
-|*
-\************************************************************************/
-
+/**
+ * Apply data of the FrameView on the current view
+ */
void DrawViewShell::ReadFrameViewData(FrameView* pView)
{
ModifyGuard aGuard( GetDoc() );
- // Diese Option wird am Model eingestellt
+ // this option has to be adjust at the model
GetDoc()->SetPickThroughTransparentTextFrames(
SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType())->IsPickThrough());
- // Initialisierungen der Zeichen-(Bildschirm-)Attribute
+ // initialization of the Character-(Screen-) attribute
if (HasRuler() != pView->HasRuler())
SetRuler( pView->HasRuler() );
@@ -304,7 +295,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
ChangeEditMode(eNewEditMode, bNewLayerMode);
SwitchPage(nSelectedPage);
- // DrawMode fuer 'Normales' Fenster wiederherstellen
+ // restore DrawMode for 'normal' window
if(GetActiveWindow()->GetDrawMode() != pView->GetDrawMode())
GetActiveWindow()->SetDrawMode(pView->GetDrawMode());
@@ -314,20 +305,18 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
GetViewFrame()->GetDispatcher()->Execute( SID_FM_DESIGN_MODE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aDesignModeItem, 0L );
}
- // Muss am Ende gerufen werden, da ein WriteFrameViewData() ausgeloest wird
+ // has to be called in the end, because it executes a WriteFrameViewData()
if (mpDrawView->IsFrameDragSingles() != pView->IsFrameDragSingles() )
mpDrawView->SetFrameDragSingles( pView->IsFrameDragSingles() );
}
-/*************************************************************************
-|*
-|* Daten der aktuellen View auf die FrameView uebertragen
-|*
-\************************************************************************/
+/**
+ * Apply data of the current view on the FrameView
+ */
void DrawViewShell::WriteFrameViewData()
{
- // Zeichen-(Bildschirm-)Attribute an FrameView merken
+ // store character-(screen-) attribute of FrameView
mpFrameView->SetRuler( HasRuler() );
mpFrameView->SetGridCoarse( mpDrawView->GetGridCoarse() );
mpFrameView->SetGridFine( mpDrawView->GetGridFine() );
@@ -402,33 +391,24 @@ void DrawViewShell::WriteFrameViewData()
if ( mpFrameView->GetActiveLayer() != mpDrawView->GetActiveLayer() )
mpFrameView->SetActiveLayer( mpDrawView->GetActiveLayer() );
- // DrawMode fuer 'Normales' Fenster merken
+ // store DrawMode for 'normal' window
if(mpFrameView->GetDrawMode() != GetActiveWindow()->GetDrawMode())
mpFrameView->SetDrawMode(GetActiveWindow()->GetDrawMode());
}
-/*************************************************************************
-|*
-|* PrePaint-Method
-|*
-\************************************************************************/
-
void DrawViewShell::PrePaint()
{
mpDrawView->PrePaint();
}
-/*************************************************************************
-|*
-|* Paint-Methode: das Ereignis wird vom Fenster pWin an
-|* die Viewshell und die aktuelle Funktion weitergeleitet
-|*
-|* Anmerkung: pWin==NULL, wenn Paint() vom ShowWindow gerufen wird!
-|*
-\************************************************************************/
-
+/**
+ * The event is forwarded to the Viewshell and the current function by the
+ * window pWin.
+ *
+ * Remark: pWin==NULL, if Paint() is called from ShowWindow!
+ */
void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
{
// Fill var FillColor here to have it available on later call
@@ -462,12 +442,9 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
}
}
-/*************************************************************************
-|*
-|* Zoom-Faktor fuer InPlace einstellen
-|*
-\************************************************************************/
-
+/**
+ * adjust zoom factor for InPlace
+ */
void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY)
{
ViewShell::SetZoomFactor(rZoomX, rZoomY);
@@ -476,11 +453,6 @@ void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY
GetActiveWindow()->SetWinViewPos(aOrigin);
}
-/*************************************************************************
-|*
-|* Seite wird gehided
-|*
-\************************************************************************/
void DrawViewShell::HidePage()
{
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 0ab058b..5116d1b 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -63,15 +63,12 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer FontWork bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * handle SfxRequests for FontWork
+ */
void DrawViewShell::ExecFormText(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -104,7 +101,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq)
GetValue());
if(HasCurrentFunction(SID_BEZIER_EDIT))
- { // ggf. die richtige Editfunktion aktivieren
+ { // activate the right edit function if necessary
GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
}
@@ -114,12 +111,9 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* Statuswerte fuer FontWork zurueckgeben
-|*
-\************************************************************************/
-
+/**
+ * Return state values for FontWork
+ */
void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
{
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
@@ -137,7 +131,7 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
!((SdrTextObj*) pObj)->HasText() )
{
-// automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert
+// automatic open/close the FontWork-Dialog; first deactivate it
rSet.DisableItem(XATTR_FORMTXTSTYLE);
rSet.DisableItem(XATTR_FORMTXTADJUST);
@@ -163,15 +157,10 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
}
}
-/*************************************************************************
-|*
-|* SfxRequests fuer Animator bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecAnimationWin( SfxRequest& rReq )
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if (HasCurrentFunction(SID_PRESENTATION))
return;
@@ -206,20 +195,17 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq )
}
}
-/*************************************************************************
-|*
-|* Statuswerte fuer Animator zurueckgeben
-|*
-|* nValue == 0 -> Kein Button
-|* nValue == 1 -> Button 'uebernehmen'
-|* nValue == 2 -> Button 'einzeln uebernehmen'
-|* nValue == 3 -> Buttons 'uebernehmen' und 'einzeln uebernehmen'
-|*
-\************************************************************************/
-
+/**
+ * Return status values for animator
+ *
+ * nValue == 0 -> No button
+ * nValue == 1 -> Button 'accept'
+ * nValue == 2 -> Button 'accept individually'
+ * nValue == 3 -> Buttons 'accept' and 'accept individually'
+ */
void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet )
{
- // Hier koennten Buttons etc. disabled werden
+ // here we could disable buttons etc.
sal_uInt16 nValue;
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
@@ -229,15 +215,15 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet )
nValue = 0;
else if( nMarkCount > 1 )
nValue = 3;
- else // 1 Objekt
+ else // 1 Object
{
const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
sal_uInt32 nInv = pObj->GetObjInventor();
sal_uInt16 nId = pObj->GetObjIdentifier();
- // 1 selektiertes Gruppenobjekt
+ // 1 selected group object
if( nInv == SdrInventor && nId == OBJ_GRUP )
nValue = 3;
- else if( nInv == SdrInventor && nId == OBJ_GRAF ) // Anim. GIF ?
+ else if( nInv == SdrInventor && nId == OBJ_GRAF ) // Animated GIF ?
{
sal_uInt16 nCount = 0;
@@ -254,15 +240,10 @@ void DrawViewShell::GetAnimationWinState( SfxItemSet& rSet )
rSet.Put( SfxUInt16Item( SID_ANIMATOR_STATE, nValue ) );
}
-/*************************************************************************
-|*
-|* Statuswerte fuer SfxChildWindows setzen
-|*
-\************************************************************************/
void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
{
- // Stati der SfxChild-Windows (Animator, Fontwork etc.)
+ // State of SfxChild-Windows (Animator, Fontwork etc.)
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_FONTWORK ) )
{
sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
@@ -316,15 +297,12 @@ void DrawViewShell::SetChildWindowState( SfxItemSet& rSet )
}
-/*************************************************************************
-|*
-|* SfxRequests fuer Pipette bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * Handle SfxRequests for pipette
+ */
void DrawViewShell::ExecBmpMask( SfxRequest& rReq )
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if (HasCurrentFunction(SID_PRESENTATION))
return;
@@ -425,12 +403,9 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet )
rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) );
}
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
-
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp04(SfxRequest& rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
@@ -600,10 +575,11 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
case SID_CONVERT_TO_3D_LATHE_FAST:
{
- // Der Aufruf ist ausreichend. Die Initialisierung per Start3DCreation und CreateMirrorPolygons
- // ist nicht mehr noetig, falls der Parameter sal_True uebergeben wird. Dann wird sofort und
- // ohne Benutzereingriff ein gekippter Rotationskoerper mit einer Achse links neben dem
- // Umschliessenden Rechteck der slektierten Objekte gezeichnet.
+ /* The call is enough. The initialization via Start3DCreation and
+ CreateMirrorPolygons is no longer needed if the parameter
+ sal_True is provided. Then a tilted rotary body with an axis left
+ besides the bounding rectangle of the selected objects is drawn
+ immediately and without user interaction. */
mpDrawView->SdrEndTextEdit();
if(GetActiveWindow())
GetActiveWindow()->EnterWait();
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index b7ef100..6410050 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -204,11 +204,6 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
return 0;
}
-/*************************************************************************
-|*
-|* Status (Enabled/Disabled) von Menue-SfxSlots setzen
-|*
-\************************************************************************/
void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
@@ -238,10 +233,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
//format paintbrush
FuFormatPaintBrush::GetMenuState( *this, rSet );
- // Stati der SfxChild-Windows (Animator, Fontwork etc.)
+ // State of SfxChild-Windows (Animator, Fontwork etc.)
SetChildWindowState( rSet );
- // Images der Toolboxen mappen (nur Zoom)
+ // map images of toolboxes (only zoom)
UpdateToolboxImages( rSet, sal_False );
if(HasCurrentFunction())
@@ -250,10 +245,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( nSId, sal_True ) );
- // Bewirkt ein uncheck eines simulierten Slots
+ // will cause a uncheck of a simulated slot
sal_uInt16 nId = GetIdBySubId( nSId );
- // Images der Toolboxen mappen
+ // map images of the toolboxes
UpdateToolboxImages( rSet );
if( nId != SID_ZOOM_TOOLBOX &&
@@ -389,7 +384,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Starten der Praesentation moeglich?
+ // is it possible to start the presentation?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) )
{
@@ -411,7 +406,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Klebepunkte
+ // glue points
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_EDITMODE ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_INSERT_POINT ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_PERCENT ) ||
@@ -427,14 +422,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_TOP ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GLUE_VERTALIGN_BOTTOM ) )
{
- // Prozent
+ // percent
TRISTATE eState = mpDrawView->IsMarkedGluePointsPercent();
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_PERCENT );
else
rSet.Put( SfxBoolItem( SID_GLUE_PERCENT, eState == STATE_CHECK ) );
- // Bei Prozent hat Alignment keinen Effekt
+ // alignment has no effect by percent
if( eState == STATE_CHECK )
{
rSet.DisableItem( SID_GLUE_HORZALIGN_CENTER );
@@ -446,41 +441,41 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
else
{
- // Horizontale Ausrichtung
+ // horizontal alignment
sal_uInt16 nHorz = mpDrawView->GetMarkedGluePointsAlign( sal_False );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_CENTER, nHorz == SDRHORZALIGN_CENTER ) );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_LEFT, nHorz == SDRHORZALIGN_LEFT ) );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_RIGHT, nHorz == SDRHORZALIGN_RIGHT ) );
- // Vertikale Ausrichtung
+ // vertical alignment
sal_uInt16 nVert = mpDrawView->GetMarkedGluePointsAlign( sal_True );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_CENTER, nVert == SDRVERTALIGN_CENTER ) );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_TOP, nVert == SDRVERTALIGN_TOP ) );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_BOTTOM, nVert == SDRVERTALIGN_BOTTOM ) );
}
- // Punkt einfuegen
+ // insert point
rSet.Put( SfxBoolItem( SID_GLUE_INSERT_POINT, mpDrawView->IsInsGluePointMode() ) );
- // Autrittsrichtung
- // Links
+ // Escape direction
+ // left
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_LEFT );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_LEFT );
else
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_LEFT, eState == STATE_CHECK ) );
- // Rechts
+ // right
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_RIGHT );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_RIGHT );
else
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_RIGHT, eState == STATE_CHECK ) );
- // Oben
+ // top
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_TOP );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_TOP );
else
rSet.Put( SfxBoolItem( SID_GLUE_ESCDIR_TOP, eState == STATE_CHECK ) );
- // Unten
+ // bottom
eState = mpDrawView->IsMarkedGluePointsEscDir( SDRESC_BOTTOM );
if( eState == STATE_DONTKNOW )
rSet.InvalidateItem( SID_GLUE_ESCDIR_BOTTOM );
@@ -530,11 +525,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_OBJECT_GRADIENT );
}
- // Morphen ggf. disablen
+ // disable morphing if necessary
if ( !mpDrawView->IsMorphingAllowed() )
rSet.DisableItem( SID_POLYGON_MORPHING );
- // Vectorize ggf. disablen
+ // disable vectorizing if necessary
if ( !mpDrawView->IsVectorizeAllowed() )
rSet.DisableItem( SID_VECTORIZE );
@@ -546,7 +541,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if ( !bConvertToPathPossible &&
!mpDrawView->IsCrookAllowed( mpDrawView->IsCrookNoContortion() ) )
{
- // Implizite Wandlung in Kurve nicht moeglich
+ // implicit transformation into curve not possible
rSet.DisableItem(SID_OBJECT_CROOK_ROTATE);
rSet.DisableItem(SID_OBJECT_CROOK_SLANT);
rSet.DisableItem(SID_OBJECT_CROOK_STRETCH);
@@ -588,7 +583,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
if( pPageView && pPageView->GetObjList()->GetObjCount() == 0 )
{
- // Sollte disabled sein, wenn kein Objekt auf der Zeichenflaeche ist:
+ // should be disabled if there is no object on the draw area:
rSet.DisableItem( SID_SELECTALL );
rSet.DisableItem( SID_SIZE_ALL );
}
@@ -738,7 +733,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if (meEditMode == EM_PAGE)
{
/**********************************************************************
- * Seiten-Modus
+ * page mode
**********************************************************************/
rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_True));
rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_False));
@@ -749,7 +744,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if (mePageKind == PK_STANDARD &&
rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE)
{
- // Gibt es eine Seite mit dem AutoLayout "Titel"?
+ // Is there a page with the AutoLayout "Title"?
sal_Bool bDisable = sal_True;
sal_uInt16 i = 0;
sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
@@ -791,7 +786,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_True));
/**********************************************************************
- * Hintergrundseiten-Modus
+ * Background page mode
**********************************************************************/
if (mePageKind == PK_STANDARD)
{
@@ -810,24 +805,24 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
sal_uInt16 i = 0;
sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD);
- // Referenziert eine Seite mit dem AutoLayout "Titel" die
- // aktuelle MasterPage?
+ // Is there a reference to the current master page from a page
+ // with the AutoLayout "Title"?
while (i < nCount && !bCheck && bDisable)
{
SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD);
- // Seite referenziert aktuelle MasterPage
+ // page does reference the current master page
if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE)
{
- // Eine Seite hat das AutoLayout "Titel"
+ // a page does have a AutoLayout "Title"
bDisable = sal_False;
SdPage& rRefMPage = (SdPage&)(pPage->TRG_GetMasterPage());
if(&rRefMPage == pMPage)
{
- // Eine Seite mit dem AutoLayout "Titel"
- // referenziert die aktuelle MasterPage
+ // a page with the AutoLayout "Title" does reference
+ // the current master page
bCheck = sal_True;
}
}
@@ -866,11 +861,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // Status der Lineale setzen
+ // set state of the ruler
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_RULER ) )
rSet.Put( SfxBoolItem( SID_RULER, HasRuler() ) );
- // nicht die letzte Seite oder eine Masterpage loeschen
+ // do not delete the last page or a master page
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_PAGE )
|| SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_MASTER_PAGE ) )
{
@@ -887,7 +882,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // darf der aktuelle Layer geloescht werden?
+ // is it allowed to delete the current layer?
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) )
{
sal_uInt16 nCurrentLayer = GetLayerTabControl()->GetCurPageId();
@@ -913,9 +908,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
OutlinerView* pOlView = mpDrawView->GetTextEditOutlinerView();
- // Sonderbehandlung f�r SID_OUTLINE_BULLET wenn Objekte
- // mit unterschiedlichen arten von NumBullet Items markiert
- // sind
+ // special treatment of for SID_OUTLINE_BULLET if objects with different
+ // kinds of NumBullets are marked
sal_Bool bHasOutliner = sal_False;
sal_Bool bHasOther = sal_False;
for(sal_uLong nNum = 0; nNum < nMarkCount; nNum++)
@@ -973,7 +967,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_ZOOM_TOOLBOX );
}
- // Zoom-Stati
+ // Zoom-State
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_IN ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_OUT )||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ZOOM_PANNING ) )
@@ -1017,7 +1011,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
}
}
- // EditText aktiv
+ // EditText active
if (GetViewShellBase().GetViewShellManager()->GetShell(RID_DRAW_TEXT_TOOLBOX) != NULL)
{
sal_uInt16 nCurrentSId = SID_ATTR_CHAR;
@@ -1033,7 +1027,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.Put( SfxBoolItem( nCurrentSId, sal_True ) );
- // Kurzform von UpdateToolboxImages()
+ // Short version of UpdateToolboxImages()
rSet.Put( TbxImageItem( SID_DRAWTBX_TEXT, nCurrentSId ) );
}
@@ -1105,7 +1099,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_OBJECT_CROOK_SLANT );
rSet.DisableItem( SID_OBJECT_CROOK_STRETCH );
- // Alle objekterzeugenden Werkzeuge disablen
+ // Disable all object-creating tools
rSet.ClearItem( SID_ATTR_CHAR );
rSet.DisableItem( SID_ATTR_CHAR );
rSet.ClearItem( SID_ATTR_CHAR_VERTICAL );
@@ -1277,7 +1271,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_3D_PYRAMID);
}
- // Sind die Module verfuegbar?
+ // are the modules available?
if (!SvtModuleOptions().IsCalc())
{
@@ -1296,7 +1290,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) );
if( (xSlideshow.is() && xSlideshow->isRunning() && (xSlideshow->getAnimationMode() != ANIMATIONMODE_PREVIEW) ) || GetDocSh()->IsPreview() )
{
- // Eigene Slots
+ // Own Slots
rSet.DisableItem( SID_PRESENTATION );
rSet.DisableItem( SID_ZOOM_IN );
rSet.DisableItem( SID_ZOOM_OUT );
@@ -1642,7 +1636,7 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
if (GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)
{
- // Outplace-Edit: Kein Umschalten erlauben
+ // Outplace-Edit: do not allow switch
rSet.ClearItem( SID_OUTLINEMODE );
rSet.DisableItem( SID_OUTLINEMODE );
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index ab297b7..f4dfc30 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -71,12 +71,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
-
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp01(SfxRequest& rReq)
{
switch(rReq.GetSlot())
@@ -230,7 +227,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
{
SetCurrentFunction( FuPage::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) );
Cancel();
- rReq.Ignore (); // es werden eigenstaendige macros generiert !!
+ rReq.Ignore (); // we generate independent macros !!
}
break;
@@ -239,7 +236,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
{
mbZoomOnPage = sal_False;
SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) );
- // Beendet sich selbst, kein Cancel() notwendig!
+ // finishes itself, no Cancel() needed!
Invalidate( SID_ZOOM_TOOLBOX );
rReq.Ignore ();
}
@@ -251,7 +248,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
SetCurrentFunction( FuDisplayOrder::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) );
Invalidate( SID_POSITION );
rReq.Ignore ();
- // Beendet sich selbst, kein Cancel() notwendig!
+ // finishes itself, no Cancel() needed!
}
break;
@@ -279,7 +276,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
break;
case SID_CAPTUREPOINT:
- // negative Werte um Aufruf aus Menue zu signalisieren
+ // negative value to signal call from menu
maMousePos = Point(-1,-1);
case SID_SET_SNAPITEM:
{
@@ -423,20 +420,15 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
default:
{
- // switch Anweisung wegen CLOOKS aufgeteilt. Alle case-Anweisungen die
- // eine Fu???? -Funktion aufrufen, sind in die Methode FuTemp01 (drviews8),
- // FuTemp02 (drviewsb) gewandert.
+ // Switch statement splitted because of CLOOKS. All case-statements
+ // which call a Fu???? - function, are gone into FuTemp01
+ // (drviews8), FuTemp02 (drviewsb).
FuTemp02(rReq);
}
break;
}
}
-/*************************************************************************
-|*
-|* Scanner-Event
-|*
-\************************************************************************/
void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& )
{
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 493a3df..243b201 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -59,15 +59,10 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer Gallery bearbeiten
-|*
-\************************************************************************/
void DrawViewShell::ExecGallery(SfxRequest& rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -82,27 +77,26 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
{
GetDocSh()->SetWaitCursor( sal_True );
- // Graphik einfuegen
+ // insert graphic
if (nFormats & SGA_FORMAT_GRAPHIC)
{
Graphic aGraphic = pGal->GetGraphic();
- // Ggf. Groesse reduzieren
+ // reduce size if necessary
Window aWindow (GetActiveWindow());
aWindow.SetMapMode(aGraphic.GetPrefMapMode());
Size aSizePix = aWindow.LogicToPixel(aGraphic.GetPrefSize());
aWindow.SetMapMode( MapMode(MAP_100TH_MM) );
Size aSize = aWindow.PixelToLogic(aSizePix);
- // Groesse ggf. auf Seitengroesse begrenzen
+ // constrain size to page size if necessary
SdrPage* pPage = mpDrawView->GetSdrPageView()->GetPage();
Size aPageSize = pPage->GetSize();
aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder();
aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
- // Falls Grafik zu gross, wird die Grafik
- // in die Seite eingepasst
+ // if the graphic is to big, we fit it into the page
if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) &&
aSize.Height() && aPageSize.Height() )
{
@@ -111,7 +105,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
float fWinWH = (float)aPageSize.Width() /
(float)aPageSize.Height();
- // Grafik an Pagesize anpassen (skaliert)
+ // adjust graphic to page size (scales)
if ((fGrfWH != 0.F) && (fGrfWH < fWinWH))
{
aSize.Width() = (long)(aPageSize.Height() * fGrfWH);
@@ -125,7 +119,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
}
- // Ausgaberechteck fuer Grafik setzen
+ // set output rectangle for graphic
Point aPnt ((aPageSize.Width() - aSize.Width()) / 2,
(aPageSize.Height() - aSize.Height()) / 2);
aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder());
@@ -137,9 +131,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
if ( mpDrawView->AreObjectsMarked() )
{
- /******************************************************
- * Ist ein leeres Graphik-Objekt vorhanden?
- ******************************************************/
+ // is there a empty graphic object?
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
if (rMarkList.GetMarkCount() == 1)
@@ -153,10 +145,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
if( pGrafObj->IsEmptyPresObj() )
{
- /******************************************
- * Das leere Graphik-Objekt bekommt eine neue
- * Graphik
- ******************************************/
+ // the empty graphic object gets a new graphic
bInsertNewObject = sal_False;
SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone();
@@ -184,7 +173,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
mpDrawView->InsertObjectAtView(pGrafObj, *pPV, SDRINSERT_SETDEFLAYER);
}
- // Soll nur ein Link benutzt werden?
+ // should we just use a link?
if( pGrafObj && pGal->IsLinkage() )
pGrafObj->SetGraphicLink( pGal->GetURL().GetMainURL( INetURLObject::NO_DECODE ), pGal->GetFilterName() );
}
@@ -201,33 +190,24 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
}
-/*************************************************************************
-|*
-|* Statuswerte fuer Gallery zurueckgeben
-|*
-\************************************************************************/
void DrawViewShell::GetGalleryState(SfxItemSet& )
{
}
-/*************************************************************************
-|*
-|* Makros fuer die Attributeinstellungen bearbeiten
-|*
-\************************************************************************/
-
-//
-// die vorgehensweise fuer die attributaenderung ist praktisch ueberall identisch
-// 1. bisherige attribute auslesen
-// 2. parameter aus dem basic-set auslesen
-// 3. gewaehltes item aus dem attribut-set loeschen
-// 4. neues attribut-item erzeugen
-// 5. item in den set eintragen
-//
+/**
+ * Edit macros for attribute configuration
+ */
+
+/* the work flow to adjust the attributes is nearly everywhere the same
+ 1. read existing attributes
+ 2. read parameter from the basic-set
+ 3. delete selected item from the attribute-set
+ 4. create new attribute-item
+ 5. insert item into set */
void DrawViewShell::AttrExec (SfxRequest &rReq)
{
- // waehrend einer Diashow wird nichts ausgefuehrt!
+ // nothing is executed during a slide show!
if(HasCurrentFunction(SID_PRESENTATION))
return;
@@ -241,7 +221,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
switch (rReq.GetSlot ())
{
- // neuen fuellstil setzen
+ // set new fill-style
case SID_SETFILLSTYLE :
if (pArgs)
if (pArgs->Count () == 1)
@@ -263,7 +243,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // linienstil neu bestimmen
+ // determine new line style
case SID_SETLINESTYLE :
if (pArgs)
if (pArgs->Count () == 1)
@@ -285,7 +265,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // linienbreite setzen
+ // set line width
case SID_SETLINEWIDTH :
if (pArgs)
if (pArgs->Count () == 1)
@@ -512,7 +492,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // einstellungen fuer farbverlauf
+ // configuration for gradients
case SID_GRADIENT :
if (pArgs)
if (pArgs->Count () == 8)
@@ -589,7 +569,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
#endif
break;
- // einstellungen fuer schraffur
+ // configuration for hatch
case SID_HATCH :
if (pArgs)
if (pArgs->Count () == 4)
@@ -764,12 +744,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
delete pAttr;
}
-/*************************************************************************
-|*
-|* Makros fuer die Attributeinstellungen bearbeiten
-|*
-\************************************************************************/
-
+/**
+ * Edit macros for attribute configuration
+ */
void DrawViewShell::AttrState (SfxItemSet& rSet)
{
SfxWhichIter aIter (rSet);
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 135b198..5ecde16 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -112,11 +112,6 @@ void SAL_CALL ScannerEventListener::disposing( const ::com::sun::star::lang::Eve
mpParent->ScannerEvent( rEventObject );
}
-/*************************************************************************
-|*
-|* Standard-Konstruktor
-|*
-\************************************************************************/
DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument )
: ViewShell (pFrame, pParentWindow, rViewShellBase)
@@ -132,11 +127,6 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
doShow();
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
DrawViewShell::~DrawViewShell()
{
@@ -200,12 +190,9 @@ DrawViewShell::~DrawViewShell()
delete [] mpSlotArray;
}
-/*************************************************************************
-|*
-|* gemeinsamer Initialisierungsanteil der beiden Konstruktoren
-|*
-\************************************************************************/
-
+/**
+ * common part of both constructors
+ */
void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
{
mpActualPage = 0;
@@ -220,11 +207,11 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
OSL_ASSERT (GetViewShell()!=NULL);
- // Array fuer Slot-/ImageMapping:
- // Gerader Eintrag: Haupt-/ToolboxSlot
- // Ungerader Eintrag: gemappter Slot
- // Achtung: Anpassen von GetIdBySubId() !!!
- // Reihenfolge (insbesondere Zoom) darf nicht geaendert werden !!!
+ /* array for slot-/image mapping:
+ even entry: main-/toolbox slot
+ odd entry: mapped slot
+ Attention: adjust GetIdBySubId() !!!
+ Do not change order (especial zoom) !!! */
mpSlotArray = new sal_uInt16[ SLOTARRAY_COUNT ];
mpSlotArray[ 0 ] = SID_OBJECT_CHOOSE_MODE;
mpSlotArray[ 1 ] = SID_OBJECT_ROTATE;
@@ -256,15 +243,15 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
GetDoc()->CreateFirstPages();
mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this);
- mpView = mpDrawView; // Pointer der Basisklasse ViewShell
- mpDrawView->SetSwapAsynchron(sal_True); // Asynchrones Laden von Graphiken
+ mpView = mpDrawView; // Pointer of base class ViewShell
+ mpDrawView->SetSwapAsynchron(sal_True); // Asynchronous load of graphics
// We do not read the page kind from the frame view anymore so we have
// to set it in order to resync frame view and this view.
mpFrameView->SetPageKind(eInitialPageKind);
mePageKind = eInitialPageKind;
meEditMode = EM_PAGE;
- DocumentType eDocType = GetDoc()->GetDocumentType(); // RTTI fasst hier noch nicht
+ DocumentType eDocType = GetDoc()->GetDocumentType(); // RTTI does not work here
switch (mePageKind)
{
case PK_STANDARD:
@@ -294,14 +281,14 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
mpDrawView->SetWorkArea(Rectangle(Point() - aVisAreaPos - aPageOrg, aSize));
- // Objekte koennen max. so gross wie die ViewSize werden
+ // objects can not grow bigger than ViewSize
GetDoc()->SetMaxObjSize(aSize);
- // Split-Handler fuer TabControls
+ // Split-Handler for TabControls
maTabControl.SetSplitHdl( LINK( this, DrawViewShell, TabSplitHdl ) );
- // Damit der richtige EditMode von der FrameView komplett eingestellt
- // werden kann, wird hier ein aktuell anderer gewaehlt (kleiner Trick)
+ /* In order to set the correct EditMode of the FrameView, we select another
+ one (small trick). */
if (mpFrameView->GetViewShEditMode(mePageKind) == EM_PAGE)
{
meEditMode = EM_MASTERPAGE;
@@ -311,7 +298,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
meEditMode = EM_PAGE;
}
- // Einstellungen der FrameView uebernehmen
+ // Use configuration of FrameView
ReadFrameViewData(mpFrameView);
if( eDocType == DOCUMENT_TYPE_DRAW )
@@ -328,7 +315,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE );
GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE );
- // AutoLayouts muessen erzeugt sein
+ // AutoLayouts have to be created
GetDoc()->StopWorkStartupDelay();
}
else if (mePageKind == PK_HANDOUT)
@@ -337,7 +324,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE );
GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE );
- // AutoLayouts muessen erzeugt sein
+ // AutoLayouts have to be created
GetDoc()->StopWorkStartupDelay();
}
else
@@ -348,7 +335,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
}
}
- // Selektionsfunktion starten
+ // start selection function
SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool());
FuPermanent(aReq);
mpDrawView->SetFrameDragSingles(sal_True);
@@ -446,24 +433,20 @@ bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow)
-/*************************************************************************
-|*
-|* pruefe ob linienzuege gezeichnet werden muessen
-|*
-\************************************************************************/
+/**
+ * check if we have to draw a polyline
+ */
/*
- linienzuege werden ueber makros als folge von
+ Polylines are represented by makros as a sequence of:
MoveTo (x, y)
- LineTo (x, y) [oder BezierTo (x, y)]
+ LineTo (x, y) [or BezierTo (x, y)]
LineTo (x, y)
:
- dargestellt. einen endbefehl fuer die linienzuege
- gibt es nicht, also muessen alle befehle in den
- requests nach LineTo (BezierTo) abgetestet und die
- punktparameter gesammelt werden.
- der erste nicht-LineTo fuehrt dann dazu, dass aus
- den gesammelten punkten der linienzug erzeugt wird
+ There is no end command for polylines. Therefore, we have to test all
+ commands in the requests for LineTo (BezierTo) and we have to gather
+ the point-parameter. The first not-LineTo leads to the creation of the
+ polyline from the gathered points.
*/
void DrawViewShell::CheckLineTo(SfxRequest& rReq)
@@ -482,12 +465,9 @@ void DrawViewShell::CheckLineTo(SfxRequest& rReq)
rReq.Ignore ();
}
-/*************************************************************************
-|*
-|* veraendere die seitemparameter, wenn SID_PAGESIZE oder SID_PAGEMARGIN
-|*
-\************************************************************************/
-
+/**
+ * Change page parameter if SID_PAGESIZE or SID_PAGEMARGIN
+ */
void DrawViewShell::SetupPage (Size &rSize,
long nLeft,
long nRight,
@@ -502,9 +482,7 @@ void DrawViewShell::SetupPage (Size &rSize,
for (i = 0; i < nPageCnt; i++)
{
- /**********************************************************************
- * Erst alle MasterPages bearbeiten
- **********************************************************************/
+ // first, handle all master pages
SdPage *pPage = GetDoc()->GetMasterSdPage(i, mePageKind);
if( pPage )
@@ -537,9 +515,7 @@ void DrawViewShell::SetupPage (Size &rSize,
for (i = 0; i < nPageCnt; i++)
{
- /**********************************************************************
- * Danach alle Pages bearbeiten
- **********************************************************************/
+ // then, handle all pages
SdPage *pPage = GetDoc()->GetSdPage(i, mePageKind);
if( pPage )
@@ -598,22 +574,17 @@ void DrawViewShell::SetupPage (Size &rSize,
GetViewFrame()->GetBindings().Invalidate(SID_RULER_NULL_OFFSET);
- // auf (neue) Seitengroesse zoomen
+ // zoom onto (new) page size
GetViewFrame()->GetDispatcher()->Execute(SID_SIZE_PAGE,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
}
-/*************************************************************************
-|*
-|* Statuswerte der Statusbar zurueckgeben
-|*
-\************************************************************************/
void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
{
- // Zoom-Item
- // Hier sollte der entsprechende Wert (Optimal ?, Seitenbreite oder
- // Seite) mit Hilfe des ZoomItems weitergegeben werden !!!
+ /* Zoom-Item
+ Here we should propagate the corresponding value (Optimal ?, page width
+ or page) with the help of the ZoomItems !!! */
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOM ) )
{
if (GetDocSh()->IsUIActive() || (SlideShow::IsRunning(GetViewShellBase())) )
@@ -630,7 +601,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
else
pZoomItem = new SvxZoomItem( SVX_ZOOM_PERCENT, nZoom );
- // Bereich einschraenken
+ // constrain area
sal_uInt16 nZoomValues = SVX_ZOOM_ENABLE_ALL;
SdrPageView* pPageView = mpDrawView->GetSdrPageView();
@@ -686,7 +657,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
aPos.X() = Fraction(aPos.X()) / aUIScale;
aPos.Y() = Fraction(aPos.Y()) / aUIScale;
- // Position- und Groesse-Items
+ // position- and size items
if ( mpDrawView->IsAction() )
{
Rectangle aRect;
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index a2f524a..850c443 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -64,12 +64,9 @@
namespace sd {
-/*************************************************************************
-|*
-|* SfxRequests fuer temporaere Funktionen
-|*
-\************************************************************************/
-
+/**
+ * SfxRequests for temporary functions
+ */
void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
sal_uInt16 nSId = rReq.GetSlot();
@@ -111,7 +108,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
{
pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() );
- // Ueberpruefung auf schon vorhandene Namen
+ // test for already existing names
sal_Bool bLoop = sal_True;
while( bLoop && pDlg->Execute() == RET_OK )
{
@@ -121,7 +118,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
if( rLayerAdmin.GetLayer( aLayerName, sal_False )
|| aLayerName.Len()==0 )
{
- // Name ist schon vorhanden
+ // name already exists
WarningBox aWarningBox (
GetParentWindow(),
WinBits( WB_OK ),
@@ -131,7 +128,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
else
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list