mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsdialog: dump separator line

Browse Source 
Change-Id: I2c9954a7f0ec3df3652733af54ea4b0f84af25e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107520
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108407
Tested-by: Jenkins
This commit is contained in:
Szymon Kłos
2020-12-10 11:38:57 +01:00
parent 68c79bd2f1
commit d985cfc550
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/vcl/toolkit/fixed.hxx
View File

@@ -62,6 +62,7 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual Size GetOptimalSize() const override; virtual Size GetOptimalSize() const override;
virtual void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) override;
}; };
class VCL_DLLPUBLIC FixedBitmap final : public Control class VCL_DLLPUBLIC FixedBitmap final : public Control

8
vcl/source/control/fixed.cxx
View File

@@ -25,6 +25,7 @@
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <controldata.hxx> #include <controldata.hxx>
#include <tools/json_writer.hxx>
#define FIXEDLINE_TEXT_BORDER 4 #define FIXEDLINE_TEXT_BORDER 4
@@ -656,6 +657,13 @@ Size FixedLine::GetOptimalSize() const
return CalcWindowSize( FixedText::CalcMinimumTextSize ( this ) ); return CalcWindowSize( FixedText::CalcMinimumTextSize ( this ) );
} }
void FixedLine::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
{
Control::DumpAsPropertyTree(rJsonWriter);
rJsonWriter.put("type", "separator");
rJsonWriter.put("orientation", (GetStyle() & WB_VERT) ? "vertical" : "horizontal");
}
void FixedBitmap::ImplInit( vcl::Window* pParent, WinBits nStyle ) void FixedBitmap::ImplInit( vcl::Window* pParent, WinBits nStyle )
{ {
nStyle = ImplInitStyle( nStyle ); nStyle = ImplInitStyle( nStyle );