summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx16
-rw-r--r--sw/source/ui/envelp/label1.cxx4
-rw-r--r--sw/source/ui/envelp/labelexp.cxx4
-rw-r--r--sw/source/ui/fldui/fldref.cxx6
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/index/cntex.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx4
-rw-r--r--sw/source/ui/vba/vbaapplication.hxx2
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx4
-rw-r--r--sw/source/ui/vba/vbaglobals.hxx2
11 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 9a1a94086dc7..31fc121f6ebd 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -75,17 +75,17 @@ class SwDropCapsPict : public Control
sal_uInt16 mnDistance;
VclPtr<Printer> mpPrinter;
bool mbDelPrinter;
- /// The _ScriptInfo structure holds information on where we change from one
+ /// The ScriptInfo structure holds information on where we change from one
/// script to another.
- struct _ScriptInfo
+ struct ScriptInfo
{
sal_uLong textWidth; ///< Physical width of this segment.
sal_uInt16 scriptType; ///< Script type (e.g. Latin, Asian, Complex)
sal_Int32 changePos; ///< Character position where the script changes.
- _ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position)
+ ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position)
: textWidth(txtWidth), scriptType(scrptType), changePos(position) {}
};
- std::vector<_ScriptInfo> maScriptChanges;
+ std::vector<ScriptInfo> maScriptChanges;
SvxFont maFont;
SvxFont maCJKFont;
SvxFont maCTLFont;
@@ -96,7 +96,7 @@ class SwDropCapsPict : public Control
void CheckScript();
Size CalcTextSize();
inline void InitPrinter();
- void _InitPrinter();
+ void InitPrinter_();
static void GetFontSettings( const SwDropCapsPage& _rPage, vcl::Font& _rFont, sal_uInt16 _nWhich );
void GetFirstScriptSegment(sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType);
bool GetNextScriptSegment(size_t &nIdx, sal_Int32 &start, sal_Int32 &end, sal_uInt16 &scriptType);
@@ -176,7 +176,7 @@ void SwDropCapsPict::SetValues( const OUString& rText, sal_uInt8 nLines, sal_uIn
void SwDropCapsPict::InitPrinter()
{
if( !mpPrinter )
- _InitPrinter();
+ InitPrinter_();
}
// Create Default-String from character-count (A, AB, ABC, ...)
@@ -446,7 +446,7 @@ void SwDropCapsPict::CheckScript()
for(;;)
{
nChg = xBreak->endOfScript( maText, nChg, nScript );
- maScriptChanges.push_back( _ScriptInfo(0, nScript, nChg) );
+ maScriptChanges.push_back( ScriptInfo(0, nScript, nChg) );
if( nChg >= maText.getLength() || nChg < 0 )
break;
nScript = xBreak->getScriptType( maText, nChg );
@@ -516,7 +516,7 @@ Size SwDropCapsPict::CalcTextSize()
return aTextSize;
}
-void SwDropCapsPict::_InitPrinter()
+void SwDropCapsPict::InitPrinter_()
{
SfxViewShell* pSh = SfxViewShell::Current();
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 9280d67e368e..ec3db5868a60 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -65,7 +65,7 @@ void SwLabRec::FillItem( SwLabItem& rItem ) const
rItem.m_nRows = nRows;
}
-void SwLabDlg::_ReplaceGroup( const OUString &rMake )
+void SwLabDlg::ReplaceGroup_( const OUString &rMake )
{
// Remove old entries
m_pRecs->erase(m_pRecs->begin() + 1, m_pRecs->end());
@@ -160,7 +160,7 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet,
}
if ( !aMakes.empty() )
- _ReplaceGroup( aMakes[nLstGroup] );
+ ReplaceGroup_( aMakes[nLstGroup] );
if (m_pExampleSet)
m_pExampleSet->Put(aItem);
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index b9b0fa67471c..903cba9f332d 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -175,7 +175,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
uno::Reference< text::XTextFieldsSupplier > xFields(xModel, uno::UNO_QUERY);
uno::Reference< container::XNameAccess > xFieldMasters = xFields->getTextFieldMasters();
- static const struct _SwLabItemMap {
+ static const struct SwLabItemMap {
const char* pName;
OUString SwLabItem:: *pValue;
} aArr[] = {
@@ -216,7 +216,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
try
{
- for( const _SwLabItemMap* p = aArr; p->pName; ++p )
+ for( const SwLabItemMap* p = aArr; p->pName; ++p )
{
OUString uFieldName(
"com.sun.star.text.FieldMaster.User."
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index df326f0166b1..670c50eee336 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -897,7 +897,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
else if (REFFLDFLAG_FOOTNOTE == nTypeId) // footnotes
{
SwSeqFieldList aArr;
- _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
+ SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
size_t nPos = 0;
@@ -918,7 +918,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
else if (REFFLDFLAG_ENDNOTE == nTypeId) // endnotes
{
SwSeqFieldList aArr;
- _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
+ SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
size_t nPos = 0;
@@ -987,7 +987,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
if( pType )
{
SwSeqFieldList aArr;
- _SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
+ SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 );
size_t nPos = 0;
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 4d06a158b1c4..1944ca989be5 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2163,7 +2163,7 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset)
// disable width and height for math objects
const SvGlobalName& rFactNm( pSh->GetOLEObject()->getClassID() );
- struct _GlobalNameId {
+ struct GlobalNameId {
sal_uInt32 n1;
sal_uInt16 n2, n3;
sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15;
@@ -2171,7 +2171,7 @@ void SwFramePage::Init(const SfxItemSet& rSet, bool bReset)
{ SO3_SM_CLASSID_40 }, { SO3_SM_CLASSID_30 } };
for ( int i = 0; i < 4; ++i ) {
- const _GlobalNameId& rId = aGlbNmIds[ i ];
+ const GlobalNameId& rId = aGlbNmIds[ i ];
SvGlobalName aGlbNm( rId.n1, rId.n2, rId.n3,
rId.b8, rId.b9, rId.b10, rId.b11,
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 4609298b7258..df833c066b8f 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -105,7 +105,7 @@ IMPL_LINK_NOARG_TYPED(SwMultiTOXTabDialog, CreateExample_Hdl, SwOneExampleFrame&
SwXTextDocument* pDoc = reinterpret_cast<SwXTextDocument*>(xDocTunnel->getSomething(SwXTextDocument::getUnoTunnelId()));
if( pDoc )
- pDoc->GetDocShell()->_LoadStyles( *rSh.GetView().GetDocShell(), true );
+ pDoc->GetDocShell()->LoadStyles_( *rSh.GetView().GetDocShell(), true );
uno::Reference< lang::XMultiServiceFactory > xFact(
xModel, uno::UNO_QUERY);
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index ee2ff2812f40..d6adf602324f 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -87,13 +87,13 @@ static bool lcl_GetSelTable( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
if( !pTableNd )
return false;
- _FndBox aFndBox( nullptr, nullptr );
+ FndBox_ aFndBox( nullptr, nullptr );
// look for all boxes / lines
{
SwSelBoxes aSelBoxes;
::GetTableSel( rSh, aSelBoxes );
- _FndPara aPara( aSelBoxes, &aFndBox );
+ FndPara aPara( aSelBoxes, &aFndBox );
const SwTable& rTable = pTableNd->GetTable();
ForEach_FndLineCopyCol( (SwTableLines&)rTable.GetTabLines(), &aPara );
}
diff --git a/sw/source/ui/vba/vbaapplication.cxx b/sw/source/ui/vba/vbaapplication.cxx
index eaa068809910..6922ccee9867 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -149,9 +149,9 @@ void SAL_CALL SwVbaApplication::setEnableCancelKey( sal_Int32/* _enableCancelKey
// seems not supported in Writer
}
-float SAL_CALL SwVbaApplication::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception)
{
- return VbaApplicationBase::CentimetersToPoints( _Centimeters );
+ return VbaApplicationBase::CentimetersToPoints( Centimeters );
}
uno::Reference< frame::XModel >
diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx
index afbdea1a714f..16b9b40b0c3f 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -55,7 +55,7 @@ public:
virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool _displayAutoCompleteTips ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) throw (css::uno::RuntimeException, std::exception) override;
- virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
// XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index bb2859f7d259..d60115d42564 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -125,9 +125,9 @@ SwVbaGlobals::getSelection() throw (uno::RuntimeException, std::exception)
return getApplication()->getSelection();
}
-float SAL_CALL SwVbaGlobals::CentimetersToPoints( float _Centimeters ) throw (uno::RuntimeException, std::exception)
+float SAL_CALL SwVbaGlobals::CentimetersToPoints( float Centimeters ) throw (uno::RuntimeException, std::exception)
{
- return getApplication()->CentimetersToPoints( _Centimeters );
+ return getApplication()->CentimetersToPoints( Centimeters );
}
OUString
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index 95abcf3d570a..47a029e6c4b3 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -57,7 +57,7 @@ public:
virtual css::uno::Any SAL_CALL Addins( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Any SAL_CALL ListGalleries( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) override;
- virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual float SAL_CALL CentimetersToPoints( float Centimeters ) throw (css::uno::RuntimeException, std::exception) override;
// XMultiServiceFactory
virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 19:26:42 +0000