summaryrefslogtreecommitdiff
path: root/sw/source/ui/frmdlg
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/frmdlg')
-rw-r--r--sw/source/ui/frmdlg/column.cxx5
-rw-r--r--sw/source/ui/frmdlg/cption.cxx1
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx3
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx25
-rw-r--r--sw/source/ui/frmdlg/frmui.src69
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx1
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx1
7 files changed, 21 insertions, 84 deletions
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 84431a85e5e6..7d6c16e23b02 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -24,6 +24,7 @@
#include "hintids.hxx"
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <sfx2/htmlmode.hxx>
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
@@ -58,12 +59,12 @@
#include "prcntfld.hxx"
#include "paratr.hxx"
#include "frmui.hrc"
-#include "poolfmt.hrc"
+#include "strings.hrc"
#include <section.hxx>
#include <docary.hxx>
#include <pagedesc.hxx>
-#include "access.hrc"
+#include "strings.hrc"
//to match associated data in ColumnPage.ui
#define LISTBOX_SELECTION 0
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 424cdf7d5c58..4a80bfb85f5b 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -44,6 +44,7 @@
#include "initui.hxx"
#include <frmui.hrc>
#include <globals.hrc>
+#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 19d81ef64a44..1a7906ce2b4b 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -35,6 +35,7 @@
#include <frmui.hrc>
#include <globals.hrc>
+#include <strings.hrc>
#include <svx/svxids.hrc>
#include <svx/flagsdef.hxx>
#include <svx/svxdlg.hxx>
@@ -78,7 +79,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame,
if(pStr)
{
- SetText(GetText() + SwResId(STR_COLL_HEADER) + *pStr + ")");
+ SetText(GetText() + SwResId(STR_FRMUI_COLL_HEADER) + *pStr + ")");
}
m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr);
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index b6ffbe1dd6ab..4c914dd67a63 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -62,6 +62,7 @@
#include <sal/macros.h>
#include <frmui.hrc>
+#include <strings.hrc>
#include <sfx2/filedlghelper.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker2.hpp>
@@ -814,7 +815,7 @@ void SwFramePage::setOptimalFrameWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
aI != aEnd; ++aI)
{
- m_pHorizontalDLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHorizontalDLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHorizontalDLB->GetOptimalSize());
@@ -855,7 +856,7 @@ void SwFramePage::setOptimalRelWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
aI != aEnd; ++aI)
{
- m_pHoriRelationLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHoriRelationLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHoriRelationLB->GetOptimalSize());
@@ -956,9 +957,9 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
else
{
if ( m_bNew )
- SetText( SwResId(STR_OLE_INSERT));
+ SetText(SwResId(STR_FRMUI_OLE_INSERT));
else
- SetText( SwResId(STR_OLE_EDIT));
+ SetText(SwResId(STR_FRMUI_OLE_EDIT));
}
}
else
@@ -974,8 +975,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
const SwFormatFrameSize& rFrameSize = static_cast<const SwFormatFrameSize&>(rSet->Get(RES_FRM_SIZE));
- m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
- m_pRelWidthRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+ m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME));
+ m_pRelWidthRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME));
if (rFrameSize.GetWidthPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetWidthPercent() != 0)
{
//calculate the rerference value from the with and relative width values
@@ -987,8 +988,8 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
else
m_pRelWidthRelationLB->Disable();
- m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::FRAME));
- m_pRelHeightRelationLB->InsertEntry(m_aFramePosString.GetString(SwFPos::REL_PG_FRAME));
+ m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::FRAME));
+ m_pRelHeightRelationLB->InsertEntry(SvxSwFramePosString::GetString(SwFPos::REL_PG_FRAME));
if (rFrameSize.GetHeightPercent() != SwFormatFrameSize::SYNCED && rFrameSize.GetHeightPercent() != 0)
{
//calculate the rerference value from the with and relative width values
@@ -1425,7 +1426,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap,
m_bIsVerticalFrame,
m_bIsVerticalL2R,
m_bIsInRightToLeft);
- OUString sEntry(m_aFramePosString.GetString(eStrId));
+ OUString sEntry(SvxSwFramePosString::GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
// don't insert entries when frames are character bound
@@ -1490,7 +1491,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
m_bIsVerticalFrame,
m_bIsVerticalL2R,
m_bIsInRightToLeft);
- const OUString sEntry = m_aFramePosString.GetString(sStrId1);
+ const OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
sal_Int32 nPos = _rLB.InsertEntry(sEntry);
_rLB.SetEntryData(nPos, &rCharMap);
if (_pMap[nMapPos].nAlign == _nAlign)
@@ -1553,7 +1554,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap,
m_bIsVerticalFrame,
m_bIsVerticalL2R,
m_bIsInRightToLeft);
- const OUString sEntry = m_aFramePosString.GetString(eStrId1);
+ const OUString sEntry = SvxSwFramePosString::GetString(eStrId1);
sal_Int32 nPos = _rLB.InsertEntry(sEntry);
_rLB.SetEntryData(nPos, &rMap);
if (sSelEntry.isEmpty() && rMap.nRelation == _nRel)
@@ -1690,7 +1691,7 @@ sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox &rAlignLB )
{
SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
- OUString sEntry = m_aFramePosString.GetString(eResId);
+ OUString sEntry = SvxSwFramePosString::GetString(eResId);
sEntry = MnemonicGenerator::EraseAllMnemonicChars( sEntry );
if (sEntry == sSelEntry)
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
deleted file mode 100644
index 1943fd85262a..000000000000
--- a/sw/source/ui/frmdlg/frmui.src
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "frmui.hrc"
-
-/*-----------------------------------------------------------------------
- Description: character alignment for frmsh.cxx - context menu
- -----------------------------------------------------------------------*/
-String STR_TOP_BASE
-{
- Text [ en-US ] = "Base line at ~top" ;
-};
-String STR_BOTTOM_BASE
-{
- Text [ en-US ] = "~Base line at bottom" ;
-};
-String STR_CENTER_BASE
-{
- Text [ en-US ] = "Base line ~centered" ;
-};
-String STR_LINE_TOP
-{
- Text [ en-US ] = "Top of line" ;
-};
-String STR_LINE_BOTTOM
-{
- Text [ en-US ] = "Bottom of line" ;
-};
-String STR_LINE_CENTER
-{
- Text [ en-US ] = "Center of line" ;
-};
-String STR_OLE_INSERT
-{
- Text [ en-US ] = "Insert object" ;
-};
-String STR_OLE_EDIT
-{
- Text [ en-US ] = "Edit object" ;
-};
-String STR_COLL_HEADER
-{
- Text [ en-US ] = " (Template: " ;
-};
-String STR_FRMUI_BORDER
-{
- Text [ en-US ] = "Borders" ;
-};
-String STR_FRMUI_PATTERN
-{
- Text [ en-US ] = "Background" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index ca2e467ff638..d7be56794271 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -22,6 +22,7 @@
#include "swtypes.hxx"
#include "pattern.hxx"
#include "frmui.hrc"
+#include "strings.hrc"
SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet)
: SfxSingleTabDialog(pParent, rSet)
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index f0e95a46cd28..4e34b1b940ab 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -28,6 +28,7 @@
#include "swtypes.hxx"
#include "uiborder.hxx"
#include "frmui.hrc"
+#include "strings.hrc"
SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType) :
SfxSingleTabDialog(pParent, rSet)
generated by cgit (git 2.34.1) at 2024-08-19 11:11:05 +0000