summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/filter/xml/XMLExportIterator.hxx1
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx1
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsProperties.cxx14
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx10
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorter.cxx14
-rw-r--r--sw/inc/hints.hxx1
-rw-r--r--sw/source/core/attr/hints.cxx1
-rw-r--r--sw/source/core/table/swtable.cxx2
-rw-r--r--vcl/inc/window.h1
-rw-r--r--vcl/source/window/window.cxx3
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx22
12 files changed, 5 insertions, 67 deletions
diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 33a0dfa8817c..f24e9b400c30 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -65,7 +65,6 @@ struct ScMyShape
ScAddress aEndAddress;
sal_Int32 nEndX;
sal_Int32 nEndY;
- bool bResizeWithCell;
css::uno::Reference<css::drawing::XShape> xShape;
bool operator<(const ScMyShape& aShape) const;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index e1b156e833b7..d6afd59f5dc3 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -554,7 +554,6 @@ void ScXMLExport::CollectSharedData(SCTAB& nTableCount, sal_Int32& nShapesCount)
aMyShape.nEndX = pAnchor->maEndOffset.X();
aMyShape.nEndY = pAnchor->maEndOffset.Y();
aMyShape.xShape = xShape;
- aMyShape.bResizeWithCell = ScDrawLayer::IsResizeWithCell(*pSdrObj);
pSharedData->AddNewShape(aMyShape);
pSharedData->SetLastColumn(nTable, pAnchor->maStart.Col());
pSharedData->SetLastRow(nTable, pAnchor->maStart.Row());
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 67e376576081..70656680f5f2 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -164,8 +164,6 @@ private:
*/
model::SlideSorterModel* CreateModel();
- bool mbIsValid;
-
std::unique_ptr<controller::SlideSorterController> mpSlideSorterController;
std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel;
std::unique_ptr<view::SlideSorterView> mpSlideSorterView;
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index e0092816a327..908f3031d2be 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -25,9 +25,7 @@ namespace sd::slidesorter::controller {
Properties::Properties()
: maBackgroundColor(Application::GetSettings().GetStyleSettings().GetWindowColor()),
- maTextColor(Application::GetSettings().GetStyleSettings().GetActiveTextColor()),
maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()),
- maHighlightColor(Application::GetSettings().GetStyleSettings().GetMenuHighlightColor()),
mbIsUIReadOnly(false)
{
}
@@ -35,9 +33,7 @@ Properties::Properties()
void Properties::HandleDataChangeEvent()
{
maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor();
- maTextColor = Application::GetSettings().GetStyleSettings().GetActiveTextColor();
maSelectionColor = Application::GetSettings().GetStyleSettings().GetHighlightColor();
- maHighlightColor = Application::GetSettings().GetStyleSettings().GetMenuHighlightColor();
}
void Properties::SetBackgroundColor (const Color& rColor)
@@ -45,21 +41,11 @@ void Properties::SetBackgroundColor (const Color& rColor)
maBackgroundColor = rColor;
}
-void Properties::SetTextColor (const Color& rColor)
-{
- maTextColor = rColor;
-}
-
void Properties::SetSelectionColor (const Color& rColor)
{
maSelectionColor = rColor;
}
-void Properties::SetHighlightColor (const Color& rColor)
-{
- maHighlightColor = rColor;
-}
-
} // end of namespace ::sd::slidesorter::controller
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 1a57670d62f7..cd1914fe07a7 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -40,19 +40,11 @@ public:
const Color& GetBackgroundColor() const { return maBackgroundColor; }
void SetBackgroundColor(const Color& rColor);
- /** Return the text color.
- */
- void SetTextColor(const Color& rColor);
-
/** Return the color in which selections are to be painted.
*/
const Color& GetSelectionColor() const { return maSelectionColor; }
void SetSelectionColor(const Color& rColor);
- /** Return the color used for highlighting e.g. the current slide.
- */
- void SetHighlightColor(const Color& rColor);
-
/** The UI can be set to be read only independently from the model status.
Used for instance in the presenter view.
*/
@@ -60,9 +52,7 @@ public:
private:
Color maBackgroundColor;
- Color maTextColor;
Color maSelectionColor;
- Color maHighlightColor;
bool mbIsUIReadOnly;
};
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index b29f5e054432..92427ab51568 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -88,8 +88,7 @@ SlideSorter::SlideSorter (
sd::Window* pContentWindow,
ScrollAdaptor* pHorizontalScrollBar,
ScrollAdaptor* pVerticalScrollBar)
- : mbIsValid(false),
- mpViewShell(&rViewShell),
+ : mpViewShell(&rViewShell),
mpViewShellBase(&rViewShell.GetViewShellBase()),
mpContentWindow(pContentWindow),
mpHorizontalScrollBar(pHorizontalScrollBar),
@@ -102,8 +101,7 @@ SlideSorter::SlideSorter (
SlideSorter::SlideSorter (
ViewShellBase& rBase,
vcl::Window& rParentWindow)
- : mbIsValid(false),
- mpViewShell(nullptr),
+ : mpViewShell(nullptr),
mpViewShellBase(&rBase),
mpContentWindow(VclPtr<ContentWindow>::Create(rParentWindow,*this )),
mpHorizontalScrollBar(VclPtr<ScrollAdaptor>::Create(&rParentWindow, true)),
@@ -123,12 +121,8 @@ void SlideSorter::Init()
{
mpProperties->SetBackgroundColor(
mpContentWindow->GetSettings().GetStyleSettings().GetWindowColor());
- mpProperties->SetTextColor(
- mpContentWindow->GetSettings().GetStyleSettings().GetWindowTextColor());
mpProperties->SetSelectionColor(
mpContentWindow->GetSettings().GetStyleSettings().GetMenuHighlightColor());
- mpProperties->SetHighlightColor(
- mpContentWindow->GetSettings().GetStyleSettings().GetMenuHighlightColor());
}
CreateModelViewController ();
@@ -153,14 +147,10 @@ void SlideSorter::Init()
// Set view pointer of base class.
SetupControls();
-
- mbIsValid = true;
}
SlideSorter::~SlideSorter()
{
- mbIsValid = false;
-
ReleaseListeners();
// Dispose model, view and controller to avoid calls between them when
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 33b768b6f0c0..63d8210ef1b4 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -312,7 +312,6 @@ public:
const SwTable* pDelTable; ///< Merge: Pointer to the table to be removed
const OUString* pNewTableNm; ///< Split: the name of the new table
} m_aData;
- SwHistory* m_pHistory;
sal_uInt16 m_nSplitLine; ///< Split: from this BaseLine on will be split
TableFormulaUpdateFlags m_eFlags;
bool m_bModified : 1;
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 3da0c5939283..20190d81e642 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -83,7 +83,6 @@ SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW, std::vect
SwTableFormulaUpdate::SwTableFormulaUpdate(const SwTable* pNewTable)
: m_pTable(pNewTable)
- , m_pHistory(nullptr)
, m_nSplitLine(USHRT_MAX)
, m_eFlags(TBL_CALC)
{
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 2ea8bffd48e3..e5703eb7f039 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1644,7 +1644,6 @@ void SwTable::Split(OUString sNewTableName, sal_uInt16 nSplitLine, SwHistory* pH
aHint.m_eFlags = TBL_SPLITTBL;
aHint.m_aData.pNewTableNm = &sNewTableName;
aHint.m_nSplitLine = nSplitLine;
- aHint.m_pHistory = pHistory;
std::vector<SwTableBoxFormula*> vFormulas;
GatherFormulas(vFormulas);
@@ -1670,7 +1669,6 @@ void SwTable::Merge(SwTable& rTable, SwHistory* pHistory)
SwTableFormulaUpdate aHint(this);
aHint.m_eFlags = TBL_MERGETBL;
aHint.m_aData.pDelTable = &rTable;
- aHint.m_pHistory = pHistory;
std::vector<SwTableBoxFormula*> vFormulas;
GatherFormulas(vFormulas);
for(auto pBoxFormula: vFormulas)
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 7e821174b9e7..b4e706a4f96d 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -395,7 +395,6 @@ public:
const vcl::ILibreOfficeKitNotifier* mpLOKNotifier; ///< To emit the LOK callbacks eg. for dialog tunneling.
vcl::LOKWindowId mnLOKWindowId; ///< ID of this specific window.
- bool mbLOKParentNotifier;
bool mbUseFrameData;
};
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 44b2543deb2f..a38cc54d4742 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -736,7 +736,6 @@ WindowImpl::WindowImpl( vcl::Window& rWindow, WindowType nType )
mbDoubleBufferingRequested = bDoubleBuffer; // when we are not sure, assume it cannot do double-buffering via RenderContext
mpLOKNotifier = nullptr;
mnLOKWindowId = 0;
- mbLOKParentNotifier = false;
mbUseFrameData = false;
}
@@ -3204,8 +3203,6 @@ void Window::SetLOKNotifier(const vcl::ILibreOfficeKitNotifier* pNotifier, bool
mpWindowImpl->mnLOKWindowId = sLastLOKWindowId++;
GetLOKWindowsMap().emplace(mpWindowImpl->mnLOKWindowId, this);
}
- else
- mpWindowImpl->mbLOKParentNotifier = true;
mpWindowImpl->mpLOKNotifier = pNotifier;
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5591733cce90..792897afdf09 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -404,26 +404,10 @@ struct LineNumberSettings
/// Contains information about a table that will be potentially converted to a floating one at the section end.
struct FloatingTableInfo
{
- css::uno::Reference<css::text::XTextRange> m_xStart;
- css::uno::Reference<css::text::XTextRange> m_xEnd;
css::uno::Sequence<css::beans::PropertyValue> m_aFrameProperties;
- sal_Int32 m_nTableWidth;
- sal_Int32 m_nTableWidthType;
- /// Break type of the section that contains this table.
- sal_Int32 m_nBreakType = -1;
- /// Tables in footnotes and endnotes are always floating
- bool m_bConvertToFloatingInFootnote = false;
-
- FloatingTableInfo(css::uno::Reference<css::text::XTextRange> xStart,
- css::uno::Reference<css::text::XTextRange> xEnd,
- const css::uno::Sequence<css::beans::PropertyValue>& aFrameProperties,
- sal_Int32 nTableWidth, sal_Int32 nTableWidthType, bool bConvertToFloatingInFootnote)
- : m_xStart(std::move(xStart)),
- m_xEnd(std::move(xEnd)),
- m_aFrameProperties(aFrameProperties),
- m_nTableWidth(nTableWidth),
- m_nTableWidthType(nTableWidthType),
- m_bConvertToFloatingInFootnote(bConvertToFloatingInFootnote)
+
+ FloatingTableInfo(const css::uno::Sequence<css::beans::PropertyValue>& aFrameProperties)
+ : m_aFrameProperties(aFrameProperties)
{
}
css::uno::Any getPropertyValue(std::u16string_view propertyName);
generated by cgit (git 2.34.1) at 2025-03-13 11:49:43 +0000