summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx4
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx2
-rw-r--r--svx/source/dialog/framelinkarray.cxx6
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx32
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx8
7 files changed, 31 insertions, 31 deletions
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 5c7c6e91fcf1..ec2c6e420080 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -196,7 +196,7 @@ namespace dbaui
*/
sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const;
- OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false) const;
+ OTableConnection* GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSuppressCrossOrNaturalJoin = false) const;
/** clear the window map and connection vector without destroying it
@@ -299,7 +299,7 @@ namespace dbaui
Expected to throw. */
virtual void onNoColumns_throw();
- virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const;
+ virtual bool suppressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const;
private:
void InitColors();
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index c192c5fac664..26133d2cca42 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -40,7 +40,7 @@ namespace dbaui
Expected to throw. */
virtual void onNoColumns_throw() override;
- virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const override;
+ virtual bool suppressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const override;
public:
OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView);
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 0190b36c7c77..84a4f1549e34 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1179,7 +1179,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt)
Window::Command(rEvt);
}
-OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin) const
+OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTableWindow* pRhs,bool _bSuppressCrossOrNaturalJoin) const
{
OTableConnection* pConn = nullptr;
OSL_ENSURE(pRhs || pLhs, "OJoinTableView::GetTabConn : invalid args !");
@@ -1201,9 +1201,9 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab
)
)
{
- if ( _bSupressCrossOrNaturalJoin )
+ if ( _bSuppressCrossOrNaturalJoin )
{
- if ( supressCrossNaturalJoin(pData->GetData()) )
+ if ( suppressCrossNaturalJoin(pData->GetData()) )
continue;
}
pConn = pData;
@@ -1560,7 +1560,7 @@ void OJoinTableView::onNoColumns_throw()
throw SQLException();
}
-bool OJoinTableView::supressCrossNaturalJoin(const TTableConnectionData::value_type& ) const
+bool OJoinTableView::suppressCrossNaturalJoin(const TTableConnectionData::value_type& ) const
{
return false;
}
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 77ca793e5077..9b252dbf8b1e 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -880,7 +880,7 @@ void OQueryTableView::onNoColumns_throw()
::dbtools::throwSQLException( sError, ::dbtools::StandardSQLState::GENERAL_ERROR, nullptr );
}
-bool OQueryTableView::supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const
+bool OQueryTableView::suppressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const
{
OQueryTableConnectionData* pQueryData = static_cast<OQueryTableConnectionData*>(_pData.get());
return pQueryData && (pQueryData->GetJoinType() == CROSS_JOIN);
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index c54fc5167120..6c06c303d204 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1080,7 +1080,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
// Additionally avoid double-handling by suppressing handling when self not rotated,
// but above/left is rotated and thus already handled. Two directly connected
// rotated will paint/create both edges, they might be rotated differently.
- const bool bSupressLeft(!bRotated && nCol > nFirstCol && CELL(nCol - 1, nRow).IsRotated());
+ const bool bSuppressLeft(!bRotated && nCol > nFirstCol && CELL(nCol - 1, nRow).IsRotated());
const bool bSuppressAbove(!bRotated && nRow > nFirstRow && CELL(nCol, nRow - 1).IsRotated());
if(!aX.equalZero() && !aY.equalZero())
@@ -1121,7 +1121,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
// create left line for this Cell
if ((!bOverlapX // true for first column in merged cells or cells
|| bFirstCol) // true for non_Calc usages of this tooling
- && !bSupressLeft) // true when left is not rotated, so edge is already handled (see bRotated)
+ && !bSuppressLeft) // true when left is not rotated, so edge is already handled (see bRotated)
{
const Style& rLeft(GetCellStyleLeft(nCol, nRow));
@@ -1234,7 +1234,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
// create left line for this Cell
if ((!bOverlapX // true for first column in merged cells or cells
|| bFirstCol) // true for non_Calc usages of this tooling
- && !bSupressLeft) // true when left is not rotated, so edge is already handled (see bRotated)
+ && !bSuppressLeft) // true when left is not rotated, so edge is already handled (see bRotated)
{
const Style& rLeft(GetCellStyleLeft(nCol, nRow));
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index fcd932afb62d..b37cb66f9095 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7600,16 +7600,16 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize):
fMirrorMargins(false), fReadOnlyRecommended(false), fDfltTrueType(false),
fPagSuppressTopSpacing(false), fProtEnabled(false), fDispFormFieldSel(false), fRMView(false),
fRMPrint(false), fWriteReservation(false), fLockRev(false), fEmbedFonts(false),
- copts_fNoTabForInd(false), copts_fNoSpaceRaiseLower(false), copts_fSupressSpbfAfterPgBrk(false),
+ copts_fNoTabForInd(false), copts_fNoSpaceRaiseLower(false), copts_fSuppressSpbfAfterPgBrk(false),
copts_fWrapTrailSpaces(false), copts_fMapPrintTextColor(false), copts_fNoColumnBalance(false),
- copts_fConvMailMergeEsc(false), copts_fSupressTopSpacing(false),
+ copts_fConvMailMergeEsc(false), copts_fSuppressTopSpacing(false),
copts_fOrigWordTableRules(false), copts_fTransparentMetafiles(false),
copts_fShowBreaksInFrames(false), copts_fSwapBordersFacingPgs(false), copts_fExpShRtn(false),
rncEdn(0), nEdn(0), epc(0), fPrintFormData(false), fSaveFormData(false), fShadeFormData(false),
fWCFootnoteEdn(false), wvkSaved(0), wScaleSaved(0), zkSaved(0), fRotateFontW6(false),
iGutterPos(false), fNoTabForInd(false), fNoSpaceRaiseLower(false),
- fSupressSpbfAfterPageBreak(false), fWrapTrailSpaces(false), fMapPrintTextColor(false),
- fNoColumnBalance(false), fConvMailMergeEsc(false), fSupressTopSpacing(false),
+ fSuppressSpbfAfterPageBreak(false), fWrapTrailSpaces(false), fMapPrintTextColor(false),
+ fNoColumnBalance(false), fConvMailMergeEsc(false), fSuppressTopSpacing(false),
fOrigWordTableRules(false), fTransparentMetafiles(false), fShowBreaksInFrames(false),
fSwapBordersFacingPgs(false), fCompatibilityOptions_Unknown1_13(false), fExpShRtn(false),
fCompatibilityOptions_Unknown1_15(false), fCompatibilityOptions_Unknown1_16(false),
@@ -7713,12 +7713,12 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize):
a8Bit = Get_Byte( pData ); // 8 0x08
copts_fNoTabForInd = 0 != ( a8Bit & 0x01 );
copts_fNoSpaceRaiseLower = 0 != ( a8Bit & 0x02 );
- copts_fSupressSpbfAfterPgBrk = 0 != ( a8Bit & 0x04 );
+ copts_fSuppressSpbfAfterPgBrk = 0 != ( a8Bit & 0x04 );
copts_fWrapTrailSpaces = 0 != ( a8Bit & 0x08 );
copts_fMapPrintTextColor = 0 != ( a8Bit & 0x10 );
copts_fNoColumnBalance = 0 != ( a8Bit & 0x20 );
copts_fConvMailMergeEsc = 0 != ( a8Bit & 0x40 );
- copts_fSupressTopSpacing = 0 != ( a8Bit & 0x80 );
+ copts_fSuppressTopSpacing = 0 != ( a8Bit & 0x80 );
a8Bit = Get_Byte( pData ); // 9 0x09
copts_fOrigWordTableRules = 0 != ( a8Bit & 0x01 );
@@ -7869,17 +7869,17 @@ WW8Dop::WW8Dop():
fMirrorMargins(false), fReadOnlyRecommended(false), fDfltTrueType(true),
fPagSuppressTopSpacing(false), fProtEnabled(false), fDispFormFieldSel(false), fRMView(true),
fRMPrint(true), fWriteReservation(false), fLockRev(false), fEmbedFonts(false),
- copts_fNoTabForInd(false), copts_fNoSpaceRaiseLower(false), copts_fSupressSpbfAfterPgBrk(false),
+ copts_fNoTabForInd(false), copts_fNoSpaceRaiseLower(false), copts_fSuppressSpbfAfterPgBrk(false),
copts_fWrapTrailSpaces(false), copts_fMapPrintTextColor(false), copts_fNoColumnBalance(false),
- copts_fConvMailMergeEsc(false), copts_fSupressTopSpacing(false),
+ copts_fConvMailMergeEsc(false), copts_fSuppressTopSpacing(false),
copts_fOrigWordTableRules(false), copts_fTransparentMetafiles(false),
copts_fShowBreaksInFrames(false), copts_fSwapBordersFacingPgs(false), copts_fExpShRtn(false),
dxaTab(0x2d0), dxaHotZ(0x168), nRevision(1),
rncEdn(0), nEdn(1), epc(3), fPrintFormData(false), fSaveFormData(false), fShadeFormData(true),
fWCFootnoteEdn(false), wvkSaved(2), wScaleSaved(100), zkSaved(0), fRotateFontW6(false),
iGutterPos(false), fNoTabForInd(false), fNoSpaceRaiseLower(false),
- fSupressSpbfAfterPageBreak(false), fWrapTrailSpaces(false), fMapPrintTextColor(false),
- fNoColumnBalance(false), fConvMailMergeEsc(false), fSupressTopSpacing(false),
+ fSuppressSpbfAfterPageBreak(false), fWrapTrailSpaces(false), fMapPrintTextColor(false),
+ fNoColumnBalance(false), fConvMailMergeEsc(false), fSuppressTopSpacing(false),
fOrigWordTableRules(false), fTransparentMetafiles(false), fShowBreaksInFrames(false),
fSwapBordersFacingPgs(false), fCompatibilityOptions_Unknown1_13(false), fExpShRtn(false),
fCompatibilityOptions_Unknown1_15(false), fCompatibilityOptions_Unknown1_16(false),
@@ -7931,12 +7931,12 @@ void WW8Dop::SetCompatibilityOptions(sal_uInt32 a32Bit)
{
fNoTabForInd = ( a32Bit & 0x00000001 ) ;
fNoSpaceRaiseLower = ( a32Bit & 0x00000002 ) >> 1 ;
- fSupressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ;
+ fSuppressSpbfAfterPageBreak = ( a32Bit & 0x00000004 ) >> 2 ;
fWrapTrailSpaces = ( a32Bit & 0x00000008 ) >> 3 ;
fMapPrintTextColor = ( a32Bit & 0x00000010 ) >> 4 ;
fNoColumnBalance = ( a32Bit & 0x00000020 ) >> 5 ;
fConvMailMergeEsc = ( a32Bit & 0x00000040 ) >> 6 ;
- fSupressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ;
+ fSuppressTopSpacing = ( a32Bit & 0x00000080 ) >> 7 ;
fOrigWordTableRules = ( a32Bit & 0x00000100 ) >> 8 ;
fTransparentMetafiles = ( a32Bit & 0x00000200 ) >> 9 ;
fShowBreaksInFrames = ( a32Bit & 0x00000400 ) >> 10 ;
@@ -7969,12 +7969,12 @@ sal_uInt32 WW8Dop::GetCompatibilityOptions() const
sal_uInt32 a32Bit = 0;
if (fNoTabForInd) a32Bit |= 0x00000001;
if (fNoSpaceRaiseLower) a32Bit |= 0x00000002;
- if (fSupressSpbfAfterPageBreak) a32Bit |= 0x00000004;
+ if (fSuppressSpbfAfterPageBreak) a32Bit |= 0x00000004;
if (fWrapTrailSpaces) a32Bit |= 0x00000008;
if (fMapPrintTextColor) a32Bit |= 0x00000010;
if (fNoColumnBalance) a32Bit |= 0x00000020;
if (fConvMailMergeEsc) a32Bit |= 0x00000040;
- if (fSupressTopSpacing) a32Bit |= 0x00000080;
+ if (fSuppressTopSpacing) a32Bit |= 0x00000080;
if (fOrigWordTableRules) a32Bit |= 0x00000100;
if (fTransparentMetafiles) a32Bit |= 0x00000200;
if (fShowBreaksInFrames) a32Bit |= 0x00000400;
@@ -8152,12 +8152,12 @@ void WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
a8Bit = 0; // 8 0x08
if( copts_fNoTabForInd ) a8Bit |= 0x01;
if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02;
- if( copts_fSupressSpbfAfterPgBrk ) a8Bit |= 0x04;
+ if( copts_fSuppressSpbfAfterPgBrk ) a8Bit |= 0x04;
if( copts_fWrapTrailSpaces ) a8Bit |= 0x08;
if( copts_fMapPrintTextColor ) a8Bit |= 0x10;
if( copts_fNoColumnBalance ) a8Bit |= 0x20;
if( copts_fConvMailMergeEsc ) a8Bit |= 0x40;
- if( copts_fSupressTopSpacing ) a8Bit |= 0x80;
+ if( copts_fSuppressTopSpacing ) a8Bit |= 0x80;
Set_UInt8( pData, a8Bit );
a8Bit = 0; // 9 0x09
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 187bd0b513f3..81221db9eb82 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1655,12 +1655,12 @@ public:
// compatibility options
bool copts_fNoTabForInd : 1 /*= false*/; // when 1, don't add automatic tab stops for hanging indent
bool copts_fNoSpaceRaiseLower : 1 /*= false*/; // when 1, don't add extra space for raised or lowered characters
- bool copts_fSupressSpbfAfterPgBrk : 1 /*= false*/; // when 1, suppress the paragraph Space Before and Space After options after a page break
+ bool copts_fSuppressSpbfAfterPgBrk : 1 /*= false*/; // when 1, suppress the paragraph Space Before and Space After options after a page break
bool copts_fWrapTrailSpaces : 1 /*= false*/; // when 1, wrap trailing spaces at the end of a line to the next line
bool copts_fMapPrintTextColor : 1 /*= false*/; // when 1, print colors as black on non-color printers
bool copts_fNoColumnBalance : 1 /*= false*/; // when 1, don't balance columns for Continuous Section starts
bool copts_fConvMailMergeEsc : 1 /*= false*/;
- bool copts_fSupressTopSpacing : 1 /*= false*/; // when 1, suppress extra line spacing at top of page
+ bool copts_fSuppressTopSpacing : 1 /*= false*/; // when 1, suppress extra line spacing at top of page
bool copts_fOrigWordTableRules : 1 /*= false*/; // when 1, combine table borders like Word 5.x for the Macintosh
bool copts_fTransparentMetafiles : 1 /*= false*/; // when 1, don't blank area between metafile pictures
bool copts_fShowBreaksInFrames : 1 /*= false*/; // when 1, show hard page or column breaks in frames
@@ -1710,12 +1710,12 @@ public:
*/
bool fNoTabForInd : 1 /*= false*/; // see above in compatibility options
bool fNoSpaceRaiseLower : 1 /*= false*/; // see above
- bool fSupressSpbfAfterPageBreak : 1 /*= false*/; // see above
+ bool fSuppressSpbfAfterPageBreak : 1 /*= false*/; // see above
bool fWrapTrailSpaces : 1 /*= false*/; // see above
bool fMapPrintTextColor : 1 /*= false*/; // see above
bool fNoColumnBalance : 1 /*= false*/; // see above
bool fConvMailMergeEsc : 1 /*= false*/; // see above
- bool fSupressTopSpacing : 1 /*= false*/; // see above
+ bool fSuppressTopSpacing : 1 /*= false*/; // see above
bool fOrigWordTableRules : 1 /*= false*/; // see above
bool fTransparentMetafiles : 1 /*= false*/; // see above
bool fShowBreaksInFrames : 1 /*= false*/; // see above
generated by cgit (git 2.34.1) at 2025-02-16 03:58:38 +0000