[Libreoffice-commits] core.git: chart2/source chart2/uiconfig officecfg/registry

[Tomaž Vajngerl (via logerrit)]

 chart2/source/controller/inc/ChartController.hxx   |1 
 chart2/source/controller/main/ChartController.cxx  |3 +
 chart2/source/controller/main/ChartController_Insert.cxx   |   19 
++
 chart2/source/controller/main/ControllerCommandDispatch.cxx|1 
 chart2/uiconfig/menubar/menubar.xml|1 
 officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu |5 ++
 6 files changed, 30 insertions(+)

New commits:
commit 16fac85be1fdddb1695a29a9b8026cd4f8cfad64
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 30 23:34:19 2022 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Aug 14 19:37:42 2022 +0200

chart2: add "InsertMenuDataTable" action to menu

Change-Id: Ib60a2b061966eb61834480b63dc0653410a43a14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138248
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/controller/inc/ChartController.hxx 
b/chart2/source/controller/inc/ChartController.hxx
index 505b109fdcc7..f0f53c8b8990 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -440,6 +440,7 @@ private:
 void executeDispatch_OpenLegendDialog();
 void executeDispatch_InsertAxes();
 void executeDispatch_InsertGrid();
+void executeDispatch_OpenInsertDataTableDialog();
 
 void executeDispatch_InsertMenu_DataLabels();
 void executeDispatch_InsertMenu_Trendlines();
diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 54c91a6147dd..70b15cf0fd04 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1169,6 +1169,8 @@ void SAL_CALL ChartController::dispatch(
 this->executeDispatch_InsertErrorBars(false);
 else if( aCommand == "InsertMenuYErrorBars" )
 this->executeDispatch_InsertErrorBars(true);
+else if( aCommand == "InsertMenuDataTable" )
+this->executeDispatch_OpenInsertDataTableDialog();
 else if( aCommand == "InsertSymbol" )
  this->executeDispatch_InsertSpecialCharacter();
 else if( aCommand == "InsertTrendline" )
@@ -1631,6 +1633,7 @@ const o3tl::sorted_vector< OUString >& 
ChartController::impl_getAvailableCommand
 "DeleteTrendline","DeleteMeanValue",  
"DeleteTrendlineEquation",
 "DeleteXErrorBars",   "DeleteYErrorBars",
 "DeleteDataLabels",   "DeleteDataLabel",
+"InsertMenuDataTable",
 //format objects
 "FormatSelection", "TransformDialog",
 "DiagramType","View3D",
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx 
b/chart2/source/controller/main/ChartController_Insert.cxx
index 4f39f1068cdb..46d00eedb89c 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -52,6 +52,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -155,6 +156,24 @@ void ChartController::executeDispatch_InsertGrid()
 }
 }
 
+void ChartController::executeDispatch_OpenInsertDataTableDialog()
+{
+rtl::Reference xDiagram = getFirstDiagram();
+SolarMutexGuard aGuard;
+if (xDiagram->getDataTable().is())
+{
+xDiagram->setDataTable(uno::Reference());
+}
+else
+{
+uno::Reference xDataTable(new DataTable);
+if (xDataTable.is())
+{
+xDiagram->setDataTable(xDataTable);
+}
+}
+}
+
 void ChartController::executeDispatch_InsertTitles()
 {
 UndoGuard aUndoGuard(
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index e5035b4f053c..828d862f4306 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -584,6 +584,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
 m_aCommandAvailability[ ".uno:InsertMenuXErrorBars" ] = bIsWritable && 
m_apModelState->bSupportsStatistics;
 m_aCommandAvailability[ ".uno:InsertMenuYErrorBars" ] = bIsWritable && 
m_apModelState->bSupportsStatistics;
 m_aCommandAvailability[ ".uno:InsertSymbol" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bIsTextObject;
+m_aCommandAvailability[ ".uno:InsertMenuDataTable" ] = bIsWritable;
 
 // format objects
 bool bFormatObjectAvailable = bIsWritable && bControllerStateIsValid && 
m_apControllerState->bIsFormateableObjectSelected;
diff --git a/chart2/uiconfig/menubar/menubar.xml 
b/chart2/uiconfig/menubar/menubar.xml
index 354ebbc1903a..a48cd77d47de 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -56,6 +56,7 @@
 
 
 
+
   
 
 
diff --git 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/res_BarGeometry.cxx |3 ++-
 chart2/uiconfig/ui/tp_ChartType.ui   |3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 21f53f55f82f12fbee4e0d93ff26d3bb05ec3c55
Author: Caolán McNamara 
AuthorDate: Wed May 5 11:24:48 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed May 5 16:22:12 2021 +0200

Resolves: tdf#142049 expand widget to use unused extra space

Change-Id: I7ff6aa4feeccd790b6176cb60b6adb9b21db0f63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115135
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx 
b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index da48f4ca608a..182d391aac33 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -29,7 +29,8 @@ BarGeometryResources::BarGeometryResources(weld::Builder* 
pBuilder)
 {
 for (size_t i = 0; i < SAL_N_ELEMENTS(CHART_TYPE); ++i)
 m_xLB_Geometry->append_text(SchResId(CHART_TYPE[i]));
-m_xLB_Geometry->set_size_request(-1, m_xLB_Geometry->get_height_rows(4));
+m_xLB_Geometry->set_size_request(-1,
+ 
m_xLB_Geometry->get_height_rows(SAL_N_ELEMENTS(CHART_TYPE)));
 }
 
 void BarGeometryResources::connect_changed(const Link& 
rLink)
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui 
b/chart2/uiconfig/ui/tp_ChartType.ui
index e9f8e2ba3ce3..600bf3a4af68 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -111,6 +111,8 @@
   
 True
 False
+True
+True
 3
 
   
@@ -192,6 +194,7 @@
   
 True
 True
+True
 True
 liststore1
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Samuel Mehrbrodt (via logerrit)]

 chart2/source/controller/dialogs/res_DataLabel.cxx |6 
 chart2/source/controller/dialogs/res_DataLabel.hxx |3 
 chart2/uiconfig/ui/dlg_DataLabel.ui|  831 ++---
 chart2/uiconfig/ui/tp_DataLabel.ui |  806 ++--
 4 files changed, 854 insertions(+), 792 deletions(-)

New commits:
commit b53232033ed528d0e2c0f9b074c6853d7a3f0ddd
Author: Samuel Mehrbrodt 
AuthorDate: Thu Feb 18 13:02:13 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Feb 22 08:52:18 2021 +0100

Update Data Label dlg according to UX mockup

Change-Id: Ia9855a4bc9c5211b4510aa1053faac9e65346818
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/18
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 57a0d3c9565a..857d2b5295db 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -106,9 +106,7 @@ DataLabelResources::DataLabelResources(weld::Builder* 
pBuilder, weld::Window* pP
 , m_xCBSymbol(pBuilder->weld_check_button("CB_SYMBOL"))
 , m_xCBDataSeries(pBuilder->weld_check_button("CB_DATA_SERIES_NAME"))
 , m_xCBWrapText(pBuilder->weld_check_button("CB_WRAP_TEXT"))
-, m_xSeparatorResources(pBuilder->weld_widget("boxSEPARATOR"))
 , m_xLB_Separator(pBuilder->weld_combo_box("LB_TEXT_SEPARATOR"))
-, m_xBxLabelPlacement(pBuilder->weld_widget("boxPLACEMENT"))
 , m_xLB_LabelPlacement(pBuilder->weld_combo_box("LB_LABEL_PLACEMENT"))
 , m_xBxOrientation(pBuilder->weld_widget("boxORIENTATION"))
 , m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL"))
@@ -249,12 +247,12 @@ void DataLabelResources::EnableControls()
 if (m_xCBDataSeries->get_state() != TRISTATE_FALSE)
 ++nNumberOfCheckedLabelParts;
 
-m_xSeparatorResources->set_sensitive( nNumberOfCheckedLabelParts > 1 );
+m_xLB_Separator->set_sensitive( nNumberOfCheckedLabelParts > 1 );
 
 bool bEnableTextDir = nNumberOfCheckedLabelParts > 0;
 m_xBxTextDirection->set_sensitive( bEnableTextDir );
 bool bEnablePlacement = nNumberOfCheckedLabelParts > 0 && 
m_xLB_LabelPlacement->get_count()>1;
-m_xBxLabelPlacement->set_sensitive( bEnablePlacement );
+m_xLB_LabelPlacement->set_sensitive( bEnablePlacement );
 }
 
 m_xPB_NumberFormatForValue->set_sensitive( m_pNumberFormatter && 
m_xCBNumber->get_active() );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx 
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 1f832a4881a3..dde594b620d6 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -68,10 +68,7 @@ private:
 std::unique_ptr m_xCBDataSeries;
 std::unique_ptr m_xCBWrapText;
 
-std::unique_ptr m_xSeparatorResources;
 std::unique_ptr m_xLB_Separator;
-
-std::unique_ptr m_xBxLabelPlacement;
 std::unique_ptr m_xLB_LabelPlacement;
 
 std::unique_ptr m_xBxOrientation;
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui 
b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 1851a4f9c7d7..4826c2ee6943 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,34 +1,34 @@
 
-
+
 
   
   
 359
-1
-10
+1
+10
   
   
-False
-6
+False
+6
 Data Labels for all Data 
Series
-dialog
+dialog
 
   
-False
+False
 vertical
 12
 
   
-False
-end
+False
+end
 
   
 _OK
 True
-True
-True
-True
-True
+True
+True
+True
+True
 True
   
   
@@ -41,8 +41,8 @@
   
 _Cancel
 True
-True
-True
+True
+True
 True
   
   
@@ -55,8 +55,8 @@
   
 _Help
 True
-True
-True
+True
+True
 True
   
   
@@ -70,249 +70,270 @@
   
 False
 True
-end
+end
 0
   
 
 
-  
+  
 True
-False
-6
-vertical
+False
+6
 12
 
-  
+  
+box_left
 True
-False
-0
-none
+False
+vertical
 
-  
+   

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/DataBrowser.cxx |   36 
 chart2/uiconfig/ui/chartdatadialog.ui|   68 ---
 2 files changed, 61 insertions(+), 43 deletions(-)

New commits:
commit b70b1636b0c71dbb6f6f4f07ebdafeba94261dee
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 19:31:53 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 22:13:13 2020 +0200

tdf#133482 don't increase dialog width when new columns added

gtk will expand to fit all children, while vcl will clip.
insert a borderless ScrolledWindow with "external" scrolling
to allow the dialog to clip the children (same thing we do
for our menubar to shrink down past its natural size)

adjust the width calculation to avoid logictopixel rounding

Change-Id: Id2e4f92959f1827c6960360d1530a9c63a4d0c00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102972
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index ab967c92408d..6f7ada12cbec 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -102,9 +102,6 @@ public:
 
 bool HasFocus() const { return m_xControl->has_focus(); }
 
-void Hide() { m_xControl->hide(); }
-void Show() { m_xControl->show(); }
-
 void set_size_request(int nWidth, int nHeight) { 
m_xControl->set_size_request(nWidth, nHeight); }
 void set_margin_left(int nLeft) { m_xControl->set_margin_left(nLeft); }
 
@@ -296,23 +293,18 @@ void SeriesHeader::SetPos()
 m_spSymbol->set_size_request(aSize.Width(), aSize.Height());
 
 // series name edit field
-aSize.setWidth(nSymbolDistance);
-aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
-m_spSeriesName->set_margin_left(aSize.Width() + 2);
-aSize.setWidth( m_nWidth - nSymbolHeight - nSymbolDistance );
-sal_Int32 nHeight = 12;
-aSize.setHeight( nHeight );
+m_spSeriesName->set_margin_left(2);
+
+aSize.setWidth(nSymbolHeight);
+aSize.setHeight(12);
 aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
+aSize.setWidth(m_nWidth - aSize.Width() - 2);
 m_spSeriesName->set_size_request(aSize.Width(), aSize.Height());
 
 // color bar
-aSize.setWidth(1);
-aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
-m_spColorBar->set_margin_left(aSize.Width() + 2);
-nHeight = 3;
-aSize.setWidth( m_nWidth - 1 );
-aSize.setHeight( nHeight );
+aSize.setHeight(3);
 aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
+aSize.setWidth(m_nWidth);
 m_spColorBar->set_size_request(aSize.Width(), aSize.Height());
 
 auto xVirDev(m_spColorBar->create_virtual_device());
@@ -331,7 +323,7 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth )
 
 void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
 {
-SetWidth( m_xDevice->PixelToLogic(Size(nWidth, 0), 
MapMode(MapUnit::MapAppFont)).getWidth());
+SetWidth(nWidth);
 }
 
 void SeriesHeader::SetChartType(
@@ -356,16 +348,14 @@ void SeriesHeader::SetRange( sal_Int32 nStartCol, 
sal_Int32 nEndCol )
 
 void SeriesHeader::Show()
 {
-m_spSymbol->show();
-m_spSeriesName->Show();
-m_spColorBar->show();
+m_xContainer1->show();
+m_xContainer2->show();
 }
 
 void SeriesHeader::Hide()
 {
-m_spSymbol->hide();
-m_spSeriesName->Hide();
-m_spColorBar->hide();
+m_xContainer1->hide();
+m_xContainer2->hide();
 }
 
 void SeriesHeader::SetEditChangedHdl( const Link & 
rLink )
@@ -1346,7 +1336,7 @@ void DataBrowser::ImplAdjustHeaderControls()
 {
 if( nStartPos < nMaxPos )
 {
-(*aIt)->SetPixelWidth( nCurrentPos - nStartPos - 3 );
+(*aIt)->SetPixelWidth( nCurrentPos - nStartPos );
 (*aIt)->Show();
 
 if (pWin)
diff --git a/chart2/uiconfig/ui/chartdatadialog.ui 
b/chart2/uiconfig/ui/chartdatadialog.ui
index b790f4d912c9..b696cd19847a 100644
--- a/chart2/uiconfig/ui/chartdatadialog.ui
+++ b/chart2/uiconfig/ui/chartdatadialog.ui
@@ -252,18 +252,32 @@
 vertical
 6
 
-  
+  
 True
-False
-True
-
-  
-
+True
+external
+never
 
-  
-
-
-  
+  
+True
+False
+
+  
+True
+False
+True
+
+  
+  

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Balazs Varga (via logerrit)]

 chart2/source/controller/dialogs/res_DataLabel.cxx |5 
 chart2/source/controller/dialogs/res_DataLabel.hxx |2 
 chart2/source/controller/inc/TextLabelItemConverter.hxx|2 
 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |   36 
++
 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |   37 
++
 chart2/source/inc/chartview/ChartSfxItemIds.hxx|5 
 chart2/source/view/main/ChartItemPool.cxx  |1 
 chart2/uiconfig/ui/dlg_DataLabel.ui|   55 
++
 chart2/uiconfig/ui/tp_DataLabel.ui |   55 
++
 9 files changed, 195 insertions(+), 3 deletions(-)

New commits:
commit 28b53da4c49b2dc8550f28b07183fb7c60e1c298
Author: Balazs Varga 
AuthorDate: Tue Sep 8 10:21:33 2020 +0200
Commit: László Németh 
CommitDate: Tue Sep 15 09:57:54 2020 +0200

tdf#133227 chart UI: option to hide leader lines

between data points and displaced data labels of a data series.

Follow-up of the following commits related to the new UNO property
ShowCustomLeaderLines for data labels:

commit e2f4e65a7b8024c00b049eebf0d87637efda7f24
(tdf#134571 chart2, xmloff: add loext:custom-leader-lines)

commit 5d67d70b26706ce8a08612c12a68821f984210a2
(tdf#134563 Add UNO API for custom leader lines)

Change-Id: Id8a953b16ff737ca924c0c2c3241fba4e3ac904b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102221
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 35f96f775e01..62568fc71296 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -111,6 +111,7 @@ DataLabelResources::DataLabelResources(weld::Builder* 
pBuilder, weld::Window* pP
 , m_xLB_TextDirection(new 
TextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")))
 , m_xDC_Dial(new svx::DialControl)
 , m_xDC_DialWin(new weld::CustomWeld(*pBuilder, "CT_DIAL", *m_xDC_Dial))
+, 
m_xCBCustomLeaderLines(pBuilder->weld_check_button("CB_CUSTOM_LEADER_LINES"))
 {
 m_xDC_Dial->SetText(m_xFT_Dial->get_label());
 
@@ -143,6 +144,7 @@ DataLabelResources::DataLabelResources(weld::Builder* 
pBuilder, weld::Window* pP
 m_xCBCategory->connect_toggled(  LINK( this, DataLabelResources, CheckHdl 
));
 m_xCBSymbol->connect_toggled(  LINK( this, DataLabelResources, CheckHdl ));
 m_xCBWrapText->connect_toggled(  LINK( this, DataLabelResources, CheckHdl 
));
+m_xCBCustomLeaderLines->connect_toggled( LINK( this, DataLabelResources, 
CheckHdl ));
 
 m_bNumberFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, 
SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, 
m_nNumberFormatForValue, m_bSourceFormatForValue, m_bSourceFormatMixedState );
 m_bPercentFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, 
SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, 
m_nNumberFormatForPercent, m_bSourceFormatForPercent , 
m_bPercentSourceMixedState);
@@ -280,6 +282,8 @@ void DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs 
) const
 rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, 
m_xCBSymbol->get_active()) );
 if( m_xCBWrapText->get_state()!= TRISTATE_INDET )
 rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_WRAP_TEXT, 
m_xCBWrapText->get_active()) );
+if( m_xCBCustomLeaderLines->get_state() != TRISTATE_INDET )
+rOutAttrs->Put(SfxBoolItem( SCHATTR_DATADESCR_CUSTOM_LEADER_LINES, 
m_xCBCustomLeaderLines->get_active()) );
 
 auto const aSep = our_aLBEntryMap[m_xLB_Separator->get_active()];
 rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) );
@@ -311,6 +315,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
 lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_SHOW_CATEGORY, 
*m_xCBCategory );
 lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_SHOW_SYMBOL, 
*m_xCBSymbol );
 lcl_setBoolItemToCheckBox( rInAttrs, SCHATTR_DATADESCR_WRAP_TEXT, 
*m_xCBWrapText );
+lcl_setBoolItemToCheckBox( rInAttrs, 
SCHATTR_DATADESCR_CUSTOM_LEADER_LINES, *m_xCBCustomLeaderLines );
 
 m_bNumberFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, 
SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_SOURCE, 
m_nNumberFormatForValue, m_bSourceFormatForValue, m_bSourceFormatMixedState );
 m_bPercentFormatMixedState = !lcl_ReadNumberFormatFromItemSet( rInAttrs, 
SCHATTR_PERCENT_NUMBERFORMAT_VALUE, SCHATTR_PERCENT_NUMBERFORMAT_SOURCE, 
m_nNumberFormatForPercent, m_bSourceFormatForPercent ,  
m_bPercentSourceMixedState);
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx 
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Tünde Tóth (via logerrit)]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |   44 +++--
 chart2/source/controller/dialogs/tp_AxisPositions.cxx |   24 +++
 chart2/source/controller/dialogs/tp_AxisPositions.hxx |6 
 chart2/source/controller/inc/dlg_ObjectProperties.hxx |2 
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |   16 ++
 chart2/source/inc/ChartTypeHelper.hxx |1 
 chart2/source/inc/chartview/ChartSfxItemIds.hxx   |5 
 chart2/source/tools/ChartTypeHelper.cxx   |   16 ++
 chart2/source/view/main/ChartItemPool.cxx |1 
 chart2/uiconfig/ui/tp_AxisPositions.ui|   76 +-
 10 files changed, 166 insertions(+), 25 deletions(-)

New commits:
commit 8027cc622f8bd5260a59c360db359557cd287100
Author: Tünde Tóth 
AuthorDate: Wed May 6 14:08:37 2020 +0200
Commit: László Németh 
CommitDate: Wed May 13 13:02:01 2020 +0200

tdf#132757 UI: option to set Position Axis property of charts

Follow-up of commit 40d83914d43f60a196dfabddea0b52e2046b333a
(tdf#127792 implement UNO chart attribute MajorOrigin).

Change-Id: I68c35a4552a3915c045036d1f0f38804a00b7093
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93566
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index f0ad64bb2526..57375c33bfee 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -98,6 +98,7 @@ 
ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString
 , m_bSupportingAxisPositioning(false)
 , m_bShowAxisOrigin(false)
 , m_bIsCrossingAxisIsCategoryAxis(false)
+, m_bSupportingCategoryPositioning(false)
 , m_aCategories()
 , m_bComplexCategoriesAxis( false )
 , m_nNbPoints( 0 )
@@ -162,20 +163,6 @@ void ObjectPropertiesDialogParameter::init( const 
uno::Reference< frame::XModel
 if( aData.AxisType != chart2::AxisType::SERIES )
 m_bHasNumberProperties = true;
 
-sal_Int32 nCooSysIndex=0;
-sal_Int32 nDimensionIndex=0;
-sal_Int32 nAxisIndex=0;
-if( AxisHelper::getIndicesForAxis( xAxis, xDiagram, 
nCooSysIndex, nDimensionIndex, nAxisIndex ) )
-{
-xChartType = 
AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisIndex( xDiagram, 
nAxisIndex );
-//show positioning controls only if they make sense
-m_bSupportingAxisPositioning = 
ChartTypeHelper::isSupportingAxisPositioning( xChartType, nDimensionCount, 
nDimensionIndex );
-
-//show axis origin only for secondary y axis
-if( nDimensionIndex==1 && nAxisIndex==1 && 
ChartTypeHelper::isSupportingBaseValue( xChartType ) )
-m_bShowAxisOrigin = true;
-}
-
 //is the crossing main axis a category axes?:
 uno::Reference< XCoordinateSystem > xCooSys( 
AxisHelper::getCoordinateSystemOfAxis( xAxis, xDiagram ) );
 uno::Reference< XAxis > xCrossingMainAxis( 
AxisHelper::getCrossingMainAxis( xAxis, xCooSys ) );
@@ -191,14 +178,30 @@ void ObjectPropertiesDialogParameter::init( const 
uno::Reference< frame::XModel
 }
 }
 
-m_bComplexCategoriesAxis = false;
-if ( nDimensionIndex == 0 && aData.AxisType == 
chart2::AxisType::CATEGORY )
+sal_Int32 nCooSysIndex=0;
+sal_Int32 nDimensionIndex=0;
+sal_Int32 nAxisIndex=0;
+if( AxisHelper::getIndicesForAxis( xAxis, xDiagram, 
nCooSysIndex, nDimensionIndex, nAxisIndex ) )
 {
-ChartModel* pModel = 
dynamic_cast(xChartModel.get());
-if (pModel)
+xChartType = 
AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisIndex( xDiagram, 
nAxisIndex );
+//show positioning controls only if they make sense
+m_bSupportingAxisPositioning = 
ChartTypeHelper::isSupportingAxisPositioning( xChartType, nDimensionCount, 
nDimensionIndex );
+
+//show axis origin only for secondary y axis
+if( nDimensionIndex==1 && nAxisIndex==1 && 
ChartTypeHelper::isSupportingBaseValue( xChartType ) )
+m_bShowAxisOrigin = true;
+
+if ( nDimensionIndex == 0 && aData.AxisType == 
chart2::AxisType::CATEGORY )
 {
-ExplicitCategoriesProvider 
aExplicitCategoriesProvider( xCooSys, *pModel );
-m_bComplexCategoriesAxis = 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig offapi/com oox/source sc/source

[Tünde Tóth (via logerrit)]

 chart2/source/controller/dialogs/res_LegendPosition.cxx |7 
 chart2/source/controller/dialogs/tp_LegendPosition.cxx  |   11 +
 chart2/source/controller/dialogs/tp_LegendPosition.hxx  |1 
 chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx |   24 ++
 chart2/source/controller/sidebar/ChartElementsPanel.cxx |   69 --
 chart2/source/controller/sidebar/ChartElementsPanel.hxx |1 
 chart2/source/inc/chartview/ChartSfxItemIds.hxx |3 
 chart2/source/model/main/Legend.cxx |9 
 chart2/source/view/main/ChartItemPool.cxx   |1 
 chart2/source/view/main/VLegend.cxx |   23 +-
 chart2/uiconfig/ui/sidebarelements.ui   |  110 
++
 chart2/uiconfig/ui/tp_LegendPosition.ui |   55 +
 offapi/com/sun/star/chart2/Legend.idl   |6 
 oox/source/drawingml/chart/titleconverter.cxx   |5 
 sc/source/filter/excel/xechart.cxx  |2 
 sc/source/filter/excel/xichart.cxx  |4 
 16 files changed, 252 insertions(+), 79 deletions(-)

New commits:
commit 9fab1ba8ddc59924c633aa17c65f7330a4762726
Author: Tünde Tóth 
AuthorDate: Mon Mar 2 08:56:11 2020 +0100
Commit: László Németh 
CommitDate: Thu Mar 5 12:27:04 2020 +0100

tdf#75330 add a new overlay/no-overlay feature for the legend

Implement "Show the legend without overlapping the chart" option
for chart legend.

Change-Id: Ifbba4c81136e13995d276434dc17a97b0675428c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89810
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx 
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 494538ab4ede..50ac0602baef 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -95,16 +95,13 @@ void LegendPositionResources::writeToResources( const 
uno::Reference< frame::XMo
 case chart2::LegendPosition_LINE_START:
 m_xRbtLeft->set_active(true);
 break;
-case chart2::LegendPosition_LINE_END:
-m_xRbtRight->set_active(true);
-break;
 case chart2::LegendPosition_PAGE_START:
 m_xRbtTop->set_active(true);
 break;
 case chart2::LegendPosition_PAGE_END:
 m_xRbtBottom->set_active(true);
 break;
-case chart2::LegendPosition_CUSTOM:
+case chart2::LegendPosition_LINE_END:
 default:
 m_xRbtRight->set_active(true);
 break;
@@ -207,7 +204,7 @@ void LegendPositionResources::initFromItemSet( const 
SfxItemSet& rInAttrs )
 
 void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const
 {
-chart2::LegendPosition nLegendPosition = chart2::LegendPosition_CUSTOM;
+chart2::LegendPosition nLegendPosition = chart2::LegendPosition_LINE_END;
 if( m_xRbtLeft->get_active() )
 nLegendPosition = chart2::LegendPosition_LINE_START;
 else if( m_xRbtTop->get_active() )
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx 
b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 87275ce999ce..04697e75efc9 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -20,6 +20,7 @@
 #include "tp_LegendPosition.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -30,6 +31,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(weld::Container* 
pPage, weld::DialogCon
 : SfxTabPage(pPage, pController, "modules/schart/ui/tp_LegendPosition.ui", 
"tp_LegendPosition", )
 , m_aLegendPositionResources(*m_xBuilder)
 , m_xLbTextDirection(new 
TextDirectionListBox(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")))
+, m_xCBLegendNoOverlay(m_xBuilder->weld_check_button("CB_NO_OVERLAY"))
 {
 }
 
@@ -50,6 +52,9 @@ bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
 if (m_xLbTextDirection->get_active() != -1)
 
rOutAttrs->Put(SvxFrameDirectionItem(m_xLbTextDirection->get_active_id(), 
EE_PARA_WRITINGDIR));
 
+if (m_xCBLegendNoOverlay->get_visible())
+rOutAttrs->Put(SfxBoolItem(SCHATTR_LEGEND_NO_OVERLAY, 
m_xCBLegendNoOverlay->get_active()));
+
 return true;
 }
 
@@ -60,6 +65,12 @@ void SchLegendPosTabPage::Reset(const SfxItemSet* rInAttrs)
 const SfxPoolItem* pPoolItem = nullptr;
 if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true,  ) == 
SfxItemState::SET )
 m_xLbTextDirection->set_active_id( static_cast(pPoolItem)->GetValue() );
+
+if 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Gabor Kelemen (via logerrit)]

 chart2/source/controller/dialogs/res_DataLabel.cxx |2 +-
 chart2/uiconfig/ui/dlg_DataLabel.ui|1 +
 chart2/uiconfig/ui/tp_DataLabel.ui |1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1fb4887613f2487be6081dd62c4df30f6170e2c0
Author: Gabor Kelemen 
AuthorDate: Thu Feb 6 21:22:05 2020 +0100
Commit: László Németh 
CommitDate: Fri Feb 7 18:47:21 2020 +0100

tdf#94234 Add Period as chart data label separator

Change-Id: I50b9662b22bdb10086e6aa557622566591135514
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88139
Tested-by: Jenkins
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index e6620d7c56c8..741325178b89 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -39,7 +39,7 @@ namespace chart
 namespace
 {
 
-const OUStringLiteral our_aLBEntryMap[] = {" ", ", ", "; ", "\n"};
+const OUStringLiteral our_aLBEntryMap[] = {" ", ", ", "; ", "\n", ". "};
 
 bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 
nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& 
rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
 {
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui 
b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 4050677ee964..e38ef6b67528 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -250,6 +250,7 @@
   Comma
   Semicolon
   New line
+  Period
 
   
   
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui 
b/chart2/uiconfig/ui/tp_DataLabel.ui
index 40c26c455864..8e0ed64aa953 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -179,6 +179,7 @@
   Comma
   Semicolon
   New line
+  Period
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig include/svx svx/source svx/uiconfig sw/source sw/uiconfig

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/res_DataLabel.cxx|2 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx |2 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx  |2 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx |2 
 chart2/uiconfig/ui/dlg_DataLabel.ui   |   21 --
 chart2/uiconfig/ui/titlerotationtabpage.ui|   57 --
 chart2/uiconfig/ui/tp_DataLabel.ui|   21 --
 chart2/uiconfig/ui/tp_PolarOptions.ui |   29 ++---
 chart2/uiconfig/ui/tp_axisLabel.ui|   39 
 cui/source/tabpages/align.cxx |2 
 cui/source/tabpages/transfrm.cxx  |2 
 cui/uiconfig/ui/cellalignment.ui  |   41 
 cui/uiconfig/ui/rotationtabpage.ui|1 
 include/svx/dialcontrol.hxx   |4 -
 svx/source/dialog/dialcontrol.cxx |   17 -
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx   |2 
 svx/uiconfig/ui/sidebarpossize.ui |   35 +++
 sw/source/ui/frmdlg/frmpage.cxx   |2 
 sw/uiconfig/swriter/ui/picturepage.ui |   21 +-
 19 files changed, 77 insertions(+), 225 deletions(-)

New commits:
commit 2f4dda0a26fba2555641debdc84ec2ece1433ec6
Author: Caolán McNamara 
AuthorDate: Fri Jan 24 15:47:40 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 25 18:31:41 2020 +0100

Related: tdf#128942 remove the scrolledwindow frames from all the 
dialcontrols

Change-Id: I445753ad1eb4d441e5a5e909ae450bda6013a6b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87352
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 9c5e4617f662..e6620d7c56c8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -109,7 +109,7 @@ DataLabelResources::DataLabelResources(weld::Builder* 
pBuilder, weld::Window* pP
 , m_xNF_Degrees(pBuilder->weld_metric_spin_button("NF_LABEL_DEGREES", 
FieldUnit::DEGREE))
 , m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION"))
 , m_xLB_TextDirection(new 
TextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")))
-, m_xDC_Dial(new 
svx::DialControl(pBuilder->weld_scrolled_window("anglepreview")))
+, m_xDC_Dial(new svx::DialControl)
 , m_xDC_DialWin(new weld::CustomWeld(*pBuilder, "CT_DIAL", *m_xDC_Dial))
 {
 m_xDC_Dial->SetText(m_xFT_Dial->get_label());
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx 
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 36ec56178a07..1eaaa4063461 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -54,7 +54,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage(weld::Container* 
pPage, weld::DialogCon
 , m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
 , m_xFtTextDirection(m_xBuilder->weld_label("textdirL"))
 , m_xLbTextDirection(new 
TextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
-, m_xCtrlDial(new 
svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview")))
+, m_xCtrlDial(new svx::DialControl)
 , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, "dialCtrl", 
*m_xCtrlDial))
 {
 m_xCtrlDial->SetText(m_xFtABCD->get_label());
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx 
b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index f94536c2db35..804c4221247a 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -33,7 +33,7 @@ PolarOptionsTabPage::PolarOptionsTabPage(weld::Container* 
pPage, weld::DialogCon
 , 
m_xNF_StartingAngle(m_xBuilder->weld_metric_spin_button("NF_STARTING_ANGLE", 
FieldUnit::DEGREE))
 , m_xFL_PlotOptions(m_xBuilder->weld_frame("framePLOT_OPTIONS"))
 , 
m_xCB_IncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS_POLAR"))
-, m_xAngleDial(new 
svx::DialControl(m_xBuilder->weld_scrolled_window("anglepreview")))
+, m_xAngleDial(new svx::DialControl)
 , m_xAngleDialWin(new weld::CustomWeld(*m_xBuilder, "CT_ANGLE_DIAL", 
*m_xAngleDial))
 {
 m_xAngleDial->SetLinkedField(m_xNF_StartingAngle.get());
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx 
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 4efcb30da2bc..32510374aa33 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -38,7 +38,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* 
pPage, weld::DialogCon
 , m_xFtTextDirection(m_xBuilder->weld_label("textdirL"))
 , 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig include/svx svx/source svx/uiconfig sw/source sw/uiconfig

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/res_DataLabel.cxx|   15 ++--
 chart2/source/controller/dialogs/res_DataLabel.hxx|5 +---
 chart2/source/controller/dialogs/tp_AxisLabel.cxx |   22 +-
 chart2/source/controller/dialogs/tp_AxisLabel.hxx |4 +--
 chart2/source/controller/dialogs/tp_PolarOptions.cxx  |   12 +
 chart2/source/controller/dialogs/tp_PolarOptions.hxx  |4 +--
 chart2/source/controller/dialogs/tp_TitleRotation.cxx |   20 +---
 chart2/source/controller/dialogs/tp_TitleRotation.hxx |4 +--
 chart2/uiconfig/ui/dlg_DataLabel.ui   |2 -
 chart2/uiconfig/ui/titlerotationtabpage.ui|2 -
 chart2/uiconfig/ui/tp_DataLabel.ui|2 -
 chart2/uiconfig/ui/tp_PolarOptions.ui |2 -
 chart2/uiconfig/ui/tp_axisLabel.ui|2 -
 cui/source/inc/align.hxx  |4 +--
 cui/source/inc/transfrm.hxx   |4 +--
 cui/source/tabpages/align.cxx |   22 +-
 cui/source/tabpages/transfrm.cxx  |   15 ++--
 cui/uiconfig/ui/rotationtabpage.ui|2 -
 include/svx/dialcontrol.hxx   |   12 +
 svx/source/dialog/dialcontrol.cxx |   17 +
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx   |4 +--
 svx/uiconfig/ui/sidebarpossize.ui |2 -
 sw/source/ui/frmdlg/frmpage.cxx   |   16 +++--
 sw/source/uibase/inc/frmpage.hxx  |4 +--
 sw/uiconfig/swriter/ui/picturepage.ui |3 --
 25 files changed, 120 insertions(+), 81 deletions(-)

New commits:
commit 83057749a921286add0b7e588f67cd3522125665
Author: Caolán McNamara 
AuthorDate: Fri Jan 17 10:32:30 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Jan 17 22:06:55 2020 +0100

Resolves: tdf#130045 dial control frame not hidden along with the control

Change-Id: Idcdf3d748849fbe1ba1a6cce278373e349ba1e5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86967
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 69ed9f478746..9c5e4617f662 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -109,9 +109,10 @@ DataLabelResources::DataLabelResources(weld::Builder* 
pBuilder, weld::Window* pP
 , m_xNF_Degrees(pBuilder->weld_metric_spin_button("NF_LABEL_DEGREES", 
FieldUnit::DEGREE))
 , m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION"))
 , m_xLB_TextDirection(new 
TextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")))
-, m_xDC_Dial(new weld::CustomWeld(*pBuilder, "CT_DIAL", m_aDC_Dial))
+, m_xDC_Dial(new 
svx::DialControl(pBuilder->weld_scrolled_window("anglepreview")))
+, m_xDC_DialWin(new weld::CustomWeld(*pBuilder, "CT_DIAL", *m_xDC_Dial))
 {
-m_aDC_Dial.SetText(m_xFT_Dial->get_label());
+m_xDC_Dial->SetText(m_xFT_Dial->get_label());
 
 //fill label placement list
 std::map< sal_Int32, OUString > aPlacementToStringMap;
@@ -153,7 +154,7 @@ DataLabelResources::DataLabelResources(weld::Builder* 
pBuilder, weld::Window* pP
 m_xCBPercent->set_sensitive(false);
 }
 
-m_aDC_Dial.SetLinkedField(m_xNF_Degrees.get());
+m_xDC_Dial->SetLinkedField(m_xNF_Degrees.get());
 }
 
 DataLabelResources::~DataLabelResources()
@@ -293,9 +294,9 @@ void DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs 
) const
 if (m_xLB_TextDirection->get_active() != -1)
 rOutAttrs->Put( SvxFrameDirectionItem( 
m_xLB_TextDirection->get_active_id(), EE_PARA_WRITINGDIR ) );
 
-if( m_aDC_Dial.IsVisible() )
+if( m_xDC_Dial->IsVisible() )
 {
-sal_Int32 nDegrees = m_aDC_Dial.GetRotation();
+sal_Int32 nDegrees = m_xDC_Dial->GetRotation();
 rOutAttrs->Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
 }
 }
@@ -345,10 +346,10 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
 if( rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, true,  ) == 
SfxItemState::SET )
 {
 sal_Int32 nDegrees = static_cast< const SfxInt32Item * >( pPoolItem 
)->GetValue();
-m_aDC_Dial.SetRotation( nDegrees );
+m_xDC_Dial->SetRotation( nDegrees );
 }
 else
-m_aDC_Dial.SetRotation( 0 );
+m_xDC_Dial->SetRotation( 0 );
 
 EnableControls();
 }
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx 
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 42f5a9f24e4e..d21856cb4606 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -59,8 +59,6 @@ private:
 weld::Window*   m_pWindow;
 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/Chart2PanelFactory.cxx |   10 
 chart2/source/controller/sidebar/ChartTypePanel.cxx |  309 +---
 chart2/source/controller/sidebar/ChartTypePanel.hxx |   43 +-
 chart2/uiconfig/ui/sidebartype.ui   |  203 ++
 4 files changed, 277 insertions(+), 288 deletions(-)

New commits:
commit a9cc0100645deea53f27e35c7e754c9f062680d8
Author: Muhammet Kara 
AuthorDate: Fri Nov 15 11:13:03 2019 +0300
Commit: Muhammet Kara 
CommitDate: Fri Nov 15 16:28:50 2019 +0100

chart2: Weld ChartTypePanel

Change-Id: I8ed178ffe0d880b362f98b9754bce40b20942bd7
Reviewed-on: https://gerrit.libreoffice.org/82768
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx 
b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 33e5c75d7f82..a4235233f1bb 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -86,7 +86,15 @@ Reference SAL_CALL 
ChartPanelFactory::createUIElement (
 if (rsResourceURL.endsWith("/ElementsPanel"))
 pPanel = ChartElementsPanel::Create( pParentWindow, xFrame, 
pController );
 else if (rsResourceURL.endsWith("/TypePanel"))
-pPanel = ChartTypePanel::Create( pParentWindow, xFrame, 
pController );
+{
+//pPanel = ChartTypePanel::Create( pParentWindow, xFrame, 
pController );
+VclPtrInstance ppPanel(pParentWindow, xFrame, 
pController);
+xElement = sfx2::sidebar::SidebarPanelBase::Create(
+rsResourceURL,
+xFrame,
+ppPanel,
+css::ui::LayoutSize(-1,-1,-1));
+}
 else if (rsResourceURL.endsWith("/SeriesPanel"))
 pPanel = ChartSeriesPanel::Create(pParentWindow, xFrame, 
pController);
 else if (rsResourceURL.endsWith("/AxisPanel"))
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index 9539095e26c5..1774d6a9961b 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -37,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -51,147 +53,43 @@
 #include 
 #include 
 
-//Borrowed from vcl/inc/bitmaps.hlst
-#define IMG_ERROR "dbaccess/res/exerror.png"
-#define IMG_INFO "dbaccess/res/exinfo.png"
-#define IMG_WARN "dbaccess/res/exwarning.png"
-
 using namespace css;
 using namespace css::uno;
 
 namespace chart
 {
-enum
-{
-POS_3DSCHEME_SIMPLE = 0,
-POS_3DSCHEME_REALISTIC = 1
-};
-
-class Dim3DLookResourceGroup_unwelded : public ChangingResource
-{
-public:
-explicit Dim3DLookResourceGroup_unwelded(VclBuilderContainer* pWindow);
-
-void showControls(bool bShow);
-
-void fillControls(const ChartTypeParameter& rParameter);
-void fillParameter(ChartTypeParameter& rParameter);
-
-private:
-DECL_LINK(Dim3DLookCheckHdl, CheckBox&, void);
-DECL_LINK(SelectSchemeHdl, ListBox&, void);
-
-private:
-VclPtr m_pCB_3DLook;
-VclPtr m_pLB_Scheme;
-};
-
-Dim3DLookResourceGroup_unwelded::Dim3DLookResourceGroup_unwelded(VclBuilderContainer*
 pWindow)
-: ChangingResource()
-{
-pWindow->get(m_pCB_3DLook, "3dlook");
-pWindow->get(m_pLB_Scheme, "3dscheme");
-
-m_pCB_3DLook->SetToggleHdl(LINK(this, Dim3DLookResourceGroup_unwelded, 
Dim3DLookCheckHdl));
-m_pLB_Scheme->SetSelectHdl(LINK(this, Dim3DLookResourceGroup_unwelded, 
SelectSchemeHdl));
-}
-
-void Dim3DLookResourceGroup_unwelded::showControls(bool bShow)
-{
-m_pCB_3DLook->Show(bShow);
-m_pLB_Scheme->Show(bShow);
-}
-
-void Dim3DLookResourceGroup_unwelded::fillControls(const ChartTypeParameter& 
rParameter)
-{
-m_pCB_3DLook->Check(rParameter.b3DLook);
-m_pLB_Scheme->Enable(rParameter.b3DLook);
-
-if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple)
-m_pLB_Scheme->SelectEntryPos(POS_3DSCHEME_SIMPLE);
-else if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic)
-m_pLB_Scheme->SelectEntryPos(POS_3DSCHEME_REALISTIC);
-else
-m_pLB_Scheme->SetNoSelection();
-}
-
-void Dim3DLookResourceGroup_unwelded::fillParameter(ChartTypeParameter& 
rParameter)
-{
-rParameter.b3DLook = m_pCB_3DLook->IsChecked();
-const sal_Int32 nPos = m_pLB_Scheme->GetSelectedEntryPos();
-if (nPos == POS_3DSCHEME_SIMPLE)
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
-else if (nPos == POS_3DSCHEME_REALISTIC)
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Realistic;
-else
-rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
-}
-
-IMPL_LINK_NOARG(Dim3DLookResourceGroup_unwelded, Dim3DLookCheckHdl, CheckBox&, 
void)
-{
-if (m_pChangeListener)
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig formula/source formula/uiconfig sc/qa sd/source sd/uiconfig sfx2/source sfx2/uiconfig svx/source svx/uiconfig uite

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/dlg_DataSource.cxx  |2 +-
 chart2/uiconfig/ui/datarangedialog.ui|2 +-
 cui/source/dialogs/cuihyperdlg.cxx   |2 +-
 cui/uiconfig/ui/hyperlinkdialog.ui   |2 +-
 formula/source/ui/dlg/formula.cxx|2 +-
 formula/uiconfig/ui/formuladialog.ui |2 +-
 sc/qa/uitest/chart/tdf99069.py   |2 +-
 sd/source/ui/animations/CustomAnimationDialog.cxx|2 +-
 sd/source/ui/dlg/headerfooterdlg.cxx |2 +-
 sd/uiconfig/simpress/ui/customanimationproperties.ui |2 +-
 sd/uiconfig/simpress/ui/headerfooterdialog.ui|2 +-
 sfx2/source/control/emojicontrol.cxx |2 +-
 sfx2/uiconfig/ui/emojicontrol.ui |2 +-
 svx/source/dialog/ctredlin.cxx   |2 +-
 svx/uiconfig/ui/redlinecontrol.ui|2 +-
 uitest/demo_ui/tabcontrol.py |2 +-
 uitest/demo_ui/treelist.py   |2 +-
 vcl/uiconfig/ui/printerpropertiesdialog.ui   |2 +-
 vcl/unx/generic/print/prtsetup.cxx   |2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit a487021dcf1b540913477d537ba24d0cc462da93
Author: Caolán McNamara 
AuthorDate: Wed Oct 9 12:09:36 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 9 17:31:38 2019 +0200

name all Notebooks 'tabcontrol'

Change-Id: I5159ed77c2b3ba2f06e381a738a49dbe17a6a4dd
Reviewed-on: https://gerrit.libreoffice.org/80542
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx 
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 66b108d4c8e0..39f1d5eae6c0 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -85,7 +85,7 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
 , m_bRangeChooserTabIsValid(true)
 , m_bDataSourceTabIsValid(true)
 , m_bTogglingEnabled(true)
-, m_xTabControl(m_xBuilder->weld_notebook("notebook"))
+, m_xTabControl(m_xBuilder->weld_notebook("tabcontrol"))
 , m_xBtnOK(m_xBuilder->weld_button("ok"))
 {
 m_xRangeChooserTabPage = 
std::make_unique(m_xTabControl->get_page("range"), this,
diff --git a/chart2/uiconfig/ui/datarangedialog.ui 
b/chart2/uiconfig/ui/datarangedialog.ui
index ca28c6f1392d..0812509c6e33 100644
--- a/chart2/uiconfig/ui/datarangedialog.ui
+++ b/chart2/uiconfig/ui/datarangedialog.ui
@@ -77,7 +77,7 @@
   
 
 
-  
+  
 True
 True
 True
diff --git a/cui/source/dialogs/cuihyperdlg.cxx 
b/cui/source/dialogs/cuihyperdlg.cxx
index 8ea92bc926b2..b5fb3757c336 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -88,7 +88,7 @@ SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, 
SfxChildWindow* pChild, weld:
 , pExampleSet ( nullptr )
 , maCtrl  ( SID_HYPERLINK_GETLINK, *pBindings, this )
 , mbIsHTMLDoc ( false )
-, m_xIconCtrl(m_xBuilder->weld_notebook("icon_control"))
+, m_xIconCtrl(m_xBuilder->weld_notebook("tabcontrol"))
 , m_xOKBtn(m_xBuilder->weld_button("ok"))
 , m_xApplyBtn(m_xBuilder->weld_button("apply"))
 , m_xCancelBtn(m_xBuilder->weld_button("cancel"))
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui 
b/cui/uiconfig/ui/hyperlinkdialog.ui
index 59c1afa2af9b..c509eebaa113 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -105,7 +105,7 @@
   
 
 
-  
+  
 True
 True
 True
diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index 101e07c9354d..70e33b0a3df8 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -233,7 +233,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
 , m_nSelectionEnd(-1)
 , m_pTheRefEdit(nullptr)
 , m_pTheRefButton(nullptr)
-, m_xTabCtrl(rBuilder.weld_notebook("tabs"))
+, m_xTabCtrl(rBuilder.weld_notebook("tabcontrol"))
 , m_xParaWinBox(rBuilder.weld_container("BOX"))
 , m_xFtHeadLine(rBuilder.weld_label("headline"))
 , m_xFtFuncName(rBuilder.weld_label("funcname"))
diff --git a/formula/uiconfig/ui/formuladialog.ui 
b/formula/uiconfig/ui/formuladialog.ui
index b2f016f37508..7c88ecd3944b 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -137,7 +137,7 @@
 True
 6
 
-  
+  
 True
 True
 True
diff --git a/sc/qa/uitest/chart/tdf99069.py b/sc/qa/uitest/chart/tdf99069.py
index 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk include/vcl vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk vcl/unx

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |   51 +---
 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |   69 
 chart2/source/controller/dialogs/dlg_DataSource.cxx |4 
 chart2/source/controller/dialogs/tp_DataSource.cxx  |   24 
 chart2/source/controller/dialogs/tp_DataSource.hxx  |3 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx|   24 
 chart2/source/controller/dialogs/tp_RangeChooser.hxx|4 
 chart2/source/controller/inc/dlg_CreationWizard.hxx |6 -
 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx |4 
 chart2/uiconfig/ui/tp_RangeChooser.ui   |1 
 chart2/uiconfig/ui/wizelementspage.ui   |4 
 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |9 +
 dbaccess/source/ui/inc/dbwizsetup.hxx   |1 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx|5 
 include/vcl/roadmapwizard.hxx   |2 
 include/vcl/weld.hxx|2 
 vcl/UIConfig_vcl.mk |1 
 vcl/source/app/salvtables.cxx   |5 
 vcl/source/control/roadmapwizard.cxx|6 -
 vcl/source/control/wizardmachine.cxx|4 
 vcl/uiconfig/ui/wizard.ui   |5 
 vcl/unx/gtk3/gtk3gtkinst.cxx|   17 ++
 23 files changed, 112 insertions(+), 140 deletions(-)

New commits:
commit d661cb17610af93b1607025284f23187c6d2fc06
Author: Caolán McNamara 
AuthorDate: Thu Aug 22 11:15:57 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Aug 22 18:26:41 2019 +0200

weld chart CreationWizard

Change-Id: I7ee88c1e1b0eca5c2510a4bbba8b60c0d8a4e3e8
Reviewed-on: https://gerrit.libreoffice.org/77954
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index db54937be38c..58a744980556 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "tp_ChartType.hxx"
 #include "tp_RangeChooser.hxx"
@@ -30,9 +31,6 @@
 #include "ChartTypeTemplateProvider.hxx"
 #include "DialogModel.hxx"
 
-#define CHART_WIZARD_PAGEWIDTH  250
-#define CHART_WIZARD_PAGEHEIGHT 170
-
 using namespace css;
 
 namespace chart
@@ -45,14 +43,14 @@ namespace chart
 #define STATE_OBJECTS  3
 #define STATE_LAST STATE_OBJECTS
 
-CreationWizard::CreationWizard(vcl::Window* pParent, const 
uno::Reference& xChartModel,
+CreationWizard::CreationWizard(weld::Window* pParent, const 
uno::Reference& xChartModel,
const uno::Reference& 
xContext)
-: vcl::RoadmapWizard(pParent)
-, m_xChartModel(xChartModel,uno::UNO_QUERY)
-, m_xComponentContext(xContext)
-, m_pTemplateProvider(nullptr)
-, m_aTimerTriggeredControllerLock(xChartModel)
-, m_bCanTravel(true)
+: vcl::RoadmapWizardMachine(pParent)
+, m_xChartModel(xChartModel,uno::UNO_QUERY)
+, m_xComponentContext(xContext)
+, m_pTemplateProvider(nullptr)
+, m_aTimerTriggeredControllerLock(xChartModel)
+, m_bCanTravel(true)
 {
 m_pDialogModel.reset(new DialogModel(m_xChartModel, m_xComponentContext));
 defaultButton(WizardButtonFlags::FINISH);
@@ -69,12 +67,6 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const 
uno::ReferencegetModel().isDataFromSpreadsheet())
 {
@@ -84,6 +76,16 @@ CreationWizard::CreationWizard(vcl::Window* pParent, const 
uno::Referenceset_current_page(0);
+}
+
+short CreationWizard::run()
+{
+int nRet = vcl::RoadmapWizardMachine::run();
+if (nRet == static_cast(WizardButtonFlags::FINISH))
+return ui::dialogs::ExecutableDialogResults::OK;
+return ui::dialogs::ExecutableDialogResults::CANCEL;
 }
 
 CreationWizard::~CreationWizard() = default;
@@ -91,12 +93,18 @@ CreationWizard::~CreationWizard() = default;
 VclPtr CreationWizard::createPage(WizardState nState)
 {
 VclPtr pRet;
+
+OString sIdent(OString::number(nState));
+weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
+// TODO eventually pass DialogController as distinct argument instead of 
bundling into TabPageParent
+TabPageParent aParent(pPageContainer, this);
+
 switch( nState )
 {
 case STATE_CHARTTYPE:
 {
 m_aTimerTriggeredControllerLock.startTimer();
-VclPtrInstance pChartTypeTabPage(this,m_xChartModel);
+VclPtrInstance pChartTypeTabPage(aParent, 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_Scale.cxx |7 +++
 chart2/uiconfig/ui/tp_Scale.ui|8 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 34973d2c957606e0b793d007ad709160e7797ed7
Author: Caolán McNamara 
AuthorDate: Wed Jan 9 17:03:57 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 10 17:30:41 2019 +0100

Resolves: tdf#122398 max/min limits too small for scale FormattedSpinButtons

Change-Id: I679b6cc7e4bfc4273fc438e6d1d897ba66ead77b
Reviewed-on: https://gerrit.libreoffice.org/66049
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx 
b/chart2/source/controller/dialogs/tp_Scale.cxx
index 561295f9756d..ddd305762e24 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -96,6 +96,13 @@ ScaleTabPage::ScaleTabPage(TabPageParent pWindow,const 
SfxItemSet& rInAttrs)
 m_xCbxAutoOrigin->connect_toggled(LINK(this, ScaleTabPage, 
EnableValueHdl));
 m_xCbx_AutoTimeResolution->connect_toggled(LINK(this, ScaleTabPage, 
EnableValueHdl));
 
+const double nMin = static_cast(SAL_MIN_INT64);
+const double nMax = static_cast(SAL_MAX_INT64);
+m_xFmtFldMin->set_range(nMin, nMax);
+m_xFmtFldMax->set_range(nMin, nMax);
+m_xFmtFldStepMain->set_range(nMin, nMax);
+m_xFmtFldOrigin->set_range(nMin, nMax);
+
 m_xLB_AxisType->connect_changed(LINK(this, ScaleTabPage, 
SelectAxisTypeHdl));
 
 HideAllControls();
diff --git a/chart2/uiconfig/ui/tp_Scale.ui b/chart2/uiconfig/ui/tp_Scale.ui
index 6b5b1cf195c1..2bdcf6741716 100644
--- a/chart2/uiconfig/ui/tp_Scale.ui
+++ b/chart2/uiconfig/ui/tp_Scale.ui
@@ -3,22 +3,18 @@
 
   
   
-100
 1
 10
   
   
-100
 1
 10
   
   
-100
 1
 10
   
   
-100
 1
 10
   
@@ -425,7 +421,7 @@
 0
   
   
-False
+True
 True
 0
   
@@ -439,7 +435,7 @@
 0
   
   
-False
+True
 True
 1
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx   |   10 +
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx   |1 
 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx|2 
 chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx  |3 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |   17 
+++
 chart2/source/inc/chartview/ChartSfxItemIds.hxx|3 
 chart2/source/view/main/ChartItemPool.cxx  |1 
 chart2/uiconfig/ui/tp_SeriesToAxis.ui  |   53 
+-
 8 files changed, 87 insertions(+), 3 deletions(-)

New commits:
commit 19b2ed4dee1ec33ad55473d43bfcd0bfa194cbee
Author: Markus Mohrhard 
AuthorDate: Wed Dec 5 04:34:39 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Wed Dec 5 15:43:42 2018 +0100

related tdf#51671, add UI options for new "hide legend entry" feature

Change-Id: I4a9025e317dbd93fb45e676f266c555c72f4d18b
Reviewed-on: https://gerrit.libreoffice.org/64614
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx 
b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 2cab39c84e8e..91f2255cf99e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -53,6 +53,7 @@ SchOptionTabPage::SchOptionTabPage(TabPageParent 
pWindow,const SfxItemSet& rInAt
 , m_xRB_AssumeZero(m_xBuilder->weld_radio_button("RB_ASSUME_ZERO"))
 , m_xRB_ContinueLine(m_xBuilder->weld_radio_button("RB_CONTINUE_LINE"))
 , 
m_xCBIncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS"))
+, 
m_xCBHideLegendEntry(m_xBuilder->weld_check_button("CB_LEGEND_ENTRY_HIDDEN"))
 {
 m_xRbtAxis1->connect_toggled(LINK(this, SchOptionTabPage, EnableHdl));
 m_xRbtAxis2->connect_toggled(LINK(this, SchOptionTabPage, EnableHdl));
@@ -108,6 +109,9 @@ bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
 if (m_xCBIncludeHiddenCells->get_visible())
 rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, 
m_xCBIncludeHiddenCells->get_active()));
 
+if(m_xCBHideLegendEntry->get_visible())
+rOutAttrs->Put(SfxBoolItem(SCHATTR_HIDE_LEGEND_ENTRY, 
m_xCBHideLegendEntry->get_active()));
+
 return true;
 }
 
@@ -215,6 +219,12 @@ void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
 m_xGrpPlotOptions->show(false);
 }
 
+if (rInAttrs->GetItemState(SCHATTR_HIDE_LEGEND_ENTRY, true, ) == 
SfxItemState::SET)
+{
+bool bVal = static_cast(pPoolItem)->GetValue();
+m_xCBHideLegendEntry->set_active(bVal);
+}
+
 AdaptControlPositionsAndVisibility();
 }
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx 
b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 1f6a16aeac43..7ffbed77ca9d 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -70,6 +70,7 @@ private: //member
 std::unique_ptr m_xRB_AssumeZero;
 std::unique_ptr m_xRB_ContinueLine;
 std::unique_ptr m_xCBIncludeHiddenCells;
+std::unique_ptr m_xCBHideLegendEntry;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx 
b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index ad8fd31cfd20..378956c47212 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -74,6 +74,8 @@ private:
 
 bool m_bSupportingPlottingOfHiddenCells;
 bool m_bIncludeHiddenCells;
+
+bool m_bHideLegendEntry;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx 
b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
index b8c85f61c046..e7c0fca9b855 100644
--- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
+++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx
@@ -130,7 +130,8 @@ const sal_uInt16 nTextLabelWhichPairs[] =
 SCHATTR_CLOCKWISE,SCHATTR_CLOCKWISE, \
 SCHATTR_MISSING_VALUE_TREATMENT,SCHATTR_MISSING_VALUE_TREATMENT, \
 
SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS,
 \
-SCHATTR_INCLUDE_HIDDEN_CELLS,SCHATTR_INCLUDE_HIDDEN_CELLS
+SCHATTR_INCLUDE_HIDDEN_CELLS,SCHATTR_INCLUDE_HIDDEN_CELLS, \
+SCHATTR_HIDE_LEGEND_ENTRY,SCHATTR_HIDE_LEGEND_ENTRY
 
 const sal_uInt16 nSeriesOptionsWhichPairs[] =
 {
diff --git 
a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 7b98478e75b2..b289a16423ae 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -74,6 +74,7 @@ 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig vcl/source vcl/unx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_DataSource.cxx  |  138 ++
 chart2/source/controller/dialogs/tp_DataSource.cxx   |   30 +
 chart2/source/controller/dialogs/tp_DataSource.hxx   |4 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx |   24 -
 chart2/source/controller/dialogs/tp_RangeChooser.hxx |4 
 chart2/source/controller/inc/dlg_DataSource.hxx  |   25 -
 chart2/source/controller/main/ChartController.cxx|4 
 chart2/uiconfig/ui/datarangedialog.ui|  113 +
 chart2/uiconfig/ui/tp_DataSource.ui  |  386 +--
 chart2/uiconfig/ui/tp_RangeChooser.ui|   82 +---
 vcl/source/app/salvtables.cxx|1 
 vcl/unx/gtk3/gtk3gtkinst.cxx |1 
 12 files changed, 463 insertions(+), 349 deletions(-)

New commits:
commit 0f25a3c36f27fd51453b9a9115f236b83c143684
Author: Caolán McNamara 
AuthorDate: Mon Nov 26 20:30:25 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:10:52 2018 +0100

weld DataSourceDialog

Change-Id: I4d3eb8aa354043d3ff57b4996db7b28ad25e0262
Reviewed-on: https://gerrit.libreoffice.org/64072
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx 
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 76b03043b1dd..86651bcfd6bd 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -76,41 +76,6 @@ Reference< chart2::XChartTypeTemplate > 
DocumentChartTypeTemplateProvider::getCu
 return m_xTemplate;
 }
 
-class DataSourceTabControl : public TabControl
-{
-public:
-explicit DataSourceTabControl(vcl::Window* pParent);
-
-virtual bool DeactivatePage() override;
-
-void DisableTabToggling();
-void EnableTabToggling();
-
-private:
-bool m_bTogglingEnabled;
-};
-
-DataSourceTabControl::DataSourceTabControl(vcl::Window* pParent)
-: TabControl(pParent)
-, m_bTogglingEnabled(true)
-{
-}
-
-bool DataSourceTabControl::DeactivatePage()
-{
-return TabControl::DeactivatePage() && m_bTogglingEnabled;
-}
-
-void DataSourceTabControl::DisableTabToggling()
-{
-m_bTogglingEnabled = false;
-}
-
-void DataSourceTabControl::EnableTabToggling()
-{
-m_bTogglingEnabled = true;
-}
-
 sal_uInt16 DataSourceDialog::m_nLastPageId = 0;
 
 enum DataSourceDialogPages
@@ -119,56 +84,47 @@ enum DataSourceDialogPages
 TP_DATA_SOURCE = 2
 };
 
-DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
+DataSourceDialog::DataSourceDialog(weld::Window * pParent,
 const Reference< XChartDocument > & xChartDocument,
 const Reference< uno::XComponentContext > & xContext)
-: TabDialog(pParent, "DataRangeDialog",
-"modules/schart/ui/datarangedialog.ui")
+: GenericDialogController(pParent, "modules/schart/ui/datarangedialog.ui",
+  "DataRangeDialog")
 , m_apDocTemplateProvider(new 
DocumentChartTypeTemplateProvider(xChartDocument))
 , m_apDialogModel(new DialogModel(xChartDocument, xContext))
-, m_pTabControl(VclPtr::Create(get_content_area()))
 , m_pRangeChooserTabPage(nullptr)
 , m_pDataSourceTabPage(nullptr)
 , m_bRangeChooserTabIsValid(true)
 , m_bDataSourceTabIsValid(true)
-{
-get(m_pBtnOK, "ok");
-
-m_pTabControl->Show();
-
-m_pRangeChooserTabPage = 
VclPtr::Create(TabPageParent(m_pTabControl), 
*(m_apDialogModel.get()),
- m_apDocTemplateProvider.get(), this, true 
/* bHideDescription */ );
-m_pDataSourceTabPage = 
VclPtr::Create(TabPageParent(m_pTabControl), 
*(m_apDialogModel.get()),
-m_apDocTemplateProvider.get(), this, true 
/* bHideDescription */ );
-
-m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE) 
);
-m_pTabControl->InsertPage( TP_DATA_SOURCE,  
SchResId(STR_OBJECT_DATASERIES_PLURAL) );
-
-m_pTabControl->SetTabPage( TP_DATA_SOURCE,  m_pDataSourceTabPage );
-m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabPage );
-
-m_pTabControl->SelectTabPage( m_nLastPageId );
+, m_bTogglingEnabled(true)
+, m_xTabControl(m_xBuilder->weld_notebook("notebook"))
+, m_xBtnOK(m_xBuilder->weld_button("ok"))
+{
+TabPageParent aRangeParent(m_xTabControl->get_page("range"), this);
+m_pRangeChooserTabPage = VclPtr::Create(aRangeParent, 
*(m_apDialogModel.get()),
+ m_apDocTemplateProvider.get(), nullptr, 
true /* bHideDescription */ );
+TabPageParent aSeriesParent(m_xTabControl->get_page("series"), this);
+m_pDataSourceTabPage = VclPtr::Create(aSeriesParent, 
*(m_apDialogModel.get()),
+m_apDocTemplateProvider.get(), nullptr, 
true /* bHideDescription */ );
+m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, 
ActivatePageHdl));
+

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig extras/source include/vcl solenv/sanitizers vcl/source vcl/unx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_AxisPositions.cxx |  205 +++
 chart2/source/controller/dialogs/tp_AxisPositions.hxx |   52 -
 chart2/source/controller/dialogs/tp_Scale.cxx |  476 +++---
 chart2/source/controller/dialogs/tp_Scale.hxx |   69 +-
 chart2/uiconfig/ui/tp_AxisPositions.ui|   94 +--
 chart2/uiconfig/ui/tp_Scale.ui|  168 +++---
 extras/source/glade/libreoffice-catalog.xml.in|3 
 include/vcl/weld.hxx  |2 
 solenv/sanitizers/ui/modules/schart.suppr |9 
 vcl/source/app/salvtables.cxx |   15 
 vcl/source/control/fmtfield.cxx   |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   12 
 12 files changed, 508 insertions(+), 599 deletions(-)

New commits:
commit 11300c48d4350c2f6748a1ca04b919cfae338d41
Author: Caolán McNamara 
AuthorDate: Wed Nov 14 21:15:59 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 16 14:51:52 2018 +0100

Resolves: tdf#121246 crash in chart dialogs

Change-Id: I3bc720e44f5ea15749e6bc0f0fada3a17a783e23
Reviewed-on: https://gerrit.libreoffice.org/63463
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx 
b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index fc4fbe121299..4c098e6273a5 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -39,46 +39,29 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const 
SfxItemSet& rInAttrs)
-: SfxTabPage(pWindow
-,"tp_AxisPositions"
-,"modules/schart/ui/tp_AxisPositions.ui"
-, )
+AxisPositionsTabPage::AxisPositionsTabPage(TabPageParent pWindow,const 
SfxItemSet& rInAttrs)
+: SfxTabPage(pWindow ,"modules/schart/ui/tp_AxisPositions.ui" 
,"tp_AxisPositions" , )
 , m_pNumFormatter(nullptr)
 , m_bCrossingAxisIsCategoryAxis(false)
 , m_aCategories()
 , m_bSupportAxisPositioning(false)
+, m_xFL_AxisLine(m_xBuilder->weld_frame("FL_AXIS_LINE"))
+, m_xLB_CrossesAt(m_xBuilder->weld_combo_box("LB_CROSSES_OTHER_AXIS_AT"))
+, 
m_xED_CrossesAt(m_xBuilder->weld_formatted_spin_button("EDT_CROSSES_OTHER_AXIS_AT"))
+, m_xED_CrossesAtCategory(m_xBuilder->weld_combo_box( 
"EDT_CROSSES_OTHER_AXIS_AT_CATEGORY"))
+, 
m_xCB_AxisBetweenCategories(m_xBuilder->weld_check_button("CB_AXIS_BETWEEN_CATEGORIES"))
+, m_xFL_Labels(m_xBuilder->weld_frame("FL_LABELS"))
+, m_xLB_PlaceLabels(m_xBuilder->weld_combo_box("LB_PLACE_LABELS"))
+, 
m_xED_LabelDistance(m_xBuilder->weld_formatted_spin_button("EDT_AXIS_LABEL_DISTANCE"))
+, m_xCB_TicksInner(m_xBuilder->weld_check_button("CB_TICKS_INNER"))
+, m_xCB_TicksOuter(m_xBuilder->weld_check_button("CB_TICKS_OUTER"))
+, m_xCB_MinorInner(m_xBuilder->weld_check_button("CB_MINOR_INNER"))
+, m_xCB_MinorOuter(m_xBuilder->weld_check_button("CB_MINOR_OUTER"))
+, m_xBxPlaceTicks(m_xBuilder->weld_widget("boxPLACE_TICKS"))
+, m_xLB_PlaceTicks(m_xBuilder->weld_combo_box("LB_PLACE_TICKS"))
 {
-get(m_pFL_AxisLine, "FL_AXIS_LINE");
-get(m_pLB_CrossesAt,"LB_CROSSES_OTHER_AXIS_AT");
-get(m_pED_CrossesAt,"EDT_CROSSES_OTHER_AXIS_AT");
-get(m_pED_CrossesAtCategory, "EDT_CROSSES_OTHER_AXIS_AT_CATEGORY");
-get(m_pCB_AxisBetweenCategories, "CB_AXIS_BETWEEN_CATEGORIES");
-
-get(m_pFL_Labels, "FL_LABELS");
-get(m_pLB_PlaceLabels,"LB_PLACE_LABELS");
-get(m_pED_LabelDistance,"EDT_AXIS_LABEL_DISTANCE");
-
-get(m_pCB_TicksInner, "CB_TICKS_INNER");
-get(m_pCB_TicksOuter, "CB_TICKS_OUTER");
-get(m_pCB_MinorInner, "CB_MINOR_INNER");
-get(m_pCB_MinorOuter, "CB_MINOR_OUTER");
-
-get(m_pBxPlaceTicks, "boxPLACE_TICKS");
-get(m_pLB_PlaceTicks, "LB_PLACE_TICKS");
-
-// these are not used/implemented
-// get(m_pCB_MajorGrid, "CB_MAJOR_GRID");
-// get(m_pPB_MajorGrid, "PB_MAJOR_GRID");
-// get(m_pCB_MinorGrid, "CB_MINOR_GRID");
-// get(m_pPB_MinorGrid, "PB_MINOR_GRID");
-
-m_pLB_CrossesAt->SetSelectHdl( LINK( this, AxisPositionsTabPage, 
CrossesAtSelectHdl ) );
-m_pLB_CrossesAt->SetDropDownLineCount( m_pLB_CrossesAt->GetEntryCount() );
-
-m_pLB_PlaceLabels->SetSelectHdl( LINK( this, AxisPositionsTabPage, 
PlaceLabelsSelectHdl ) );
-m_pLB_PlaceLabels->SetDropDownLineCount( 
m_pLB_PlaceLabels->GetEntryCount() );
-m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() 
);
+m_xLB_CrossesAt->connect_changed(LINK(this, AxisPositionsTabPage, 
CrossesAtSelectHdl));
+m_xLB_PlaceLabels->connect_changed(LINK(this, AxisPositionsTabPage, 
PlaceLabelsSelectHdl));
 }
 
 AxisPositionsTabPage::~AxisPositionsTabPage()
@@ -86,66 +69,47 @@ 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig include/vcl vcl/Library_vclplug_gtk3.mk vcl/source vcl/unx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/res_Trendline.cxx |  270 ++---
 chart2/source/controller/dialogs/res_Trendline.hxx |   66 ++---
 chart2/source/controller/dialogs/tp_Trendline.cxx  |   11 
 chart2/source/controller/dialogs/tp_Trendline.hxx  |2 
 chart2/uiconfig/ui/tp_Trendline.ui |  139 --
 include/vcl/weld.hxx   |   32 ++
 vcl/Library_vclplug_gtk3.mk|1 
 vcl/source/app/salvtables.cxx  |   47 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx   |  170 -
 9 files changed, 475 insertions(+), 263 deletions(-)

New commits:
commit 39aa91cfb4620a650ceba01076a1c0aa2fbfdadf
Author: Caolán McNamara 
AuthorDate: Wed Nov 14 15:44:08 2018 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 15 18:45:22 2018 +0100

Resolves: tdf#121341 weld TrendlineTabPage

Change-Id: I8ecc1901388986bd6a3822e8d0055e48d873586c
Reviewed-on: https://gerrit.libreoffice.org/63387
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index f75ce892183e..8f140428a9da 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -32,58 +33,57 @@
 namespace chart
 {
 
-static void lcl_setValue( FormattedField& rFmtField, double fValue )
+static void lcl_setValue(weld::FormattedSpinButton& rFmtField, double fValue )
 {
-rFmtField.SetValue( fValue );
-rFmtField.SetDefaultValue( fValue );
+rFmtField.set_value(fValue);
+//TODOrFmtField.SetDefaultValue( fValue );
 }
 
-TrendlineResources::TrendlineResources( vcl::Window * pParent, const 
SfxItemSet& rInAttrs ) :
-m_eTrendLineType( SvxChartRegress::Linear ),
-m_bTrendLineUnique( true ),
-m_pNumFormatter( nullptr ),
-m_nNbPoints( 0 )
+TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const 
SfxItemSet& rInAttrs)
+: m_eTrendLineType(SvxChartRegress::Linear)
+, m_bTrendLineUnique(true)
+, m_pNumFormatter(nullptr)
+, m_nNbPoints(0)
+, m_xRB_Linear(rBuilder.weld_radio_button("linear"))
+, m_xRB_Logarithmic(rBuilder.weld_radio_button("logarithmic"))
+, m_xRB_Exponential(rBuilder.weld_radio_button("exponential"))
+, m_xRB_Power(rBuilder.weld_radio_button("power"))
+, m_xRB_Polynomial(rBuilder.weld_radio_button("polynomial"))
+, m_xRB_MovingAverage(rBuilder.weld_radio_button("movingAverage"))
+, m_xFI_Linear(rBuilder.weld_image("imageLinear"))
+, m_xFI_Logarithmic(rBuilder.weld_image("imageLogarithmic"))
+, m_xFI_Exponential(rBuilder.weld_image("imageExponential"))
+, m_xFI_Power(rBuilder.weld_image("imagePower"))
+, m_xFI_Polynomial(rBuilder.weld_image("imagePolynomial"))
+, m_xFI_MovingAverage(rBuilder.weld_image("imageMovingAverage"))
+, m_xNF_Degree(rBuilder.weld_spin_button("degree"))
+, m_xNF_Period(rBuilder.weld_spin_button("period"))
+, m_xEE_Name(rBuilder.weld_entry("entry_name"))
+, 
m_xFmtFld_ExtrapolateForward(rBuilder.weld_formatted_spin_button("extrapolateForward"))
+, 
m_xFmtFld_ExtrapolateBackward(rBuilder.weld_formatted_spin_button("extrapolateBackward"))
+, m_xCB_SetIntercept(rBuilder.weld_check_button("setIntercept"))
+, 
m_xFmtFld_InterceptValue(rBuilder.weld_formatted_spin_button("interceptValue"))
+, m_xCB_ShowEquation(rBuilder.weld_check_button("showEquation"))
+, m_xEE_XName(rBuilder.weld_entry("entry_Xname"))
+, m_xEE_YName(rBuilder.weld_entry("entry_Yname"))
+, 
m_xCB_ShowCorrelationCoeff(rBuilder.weld_check_button("showCorrelationCoefficient"))
 {
-SfxTabPage* pTabPage = reinterpret_cast(pParent);
-pTabPage->get(m_pRB_Linear,"linear");
-pTabPage->get(m_pRB_Logarithmic,"logarithmic");
-pTabPage->get(m_pRB_Exponential,"exponential");
-pTabPage->get(m_pRB_Power,"power");
-pTabPage->get(m_pRB_Polynomial,"polynomial");
-pTabPage->get(m_pRB_MovingAverage,"movingAverage");
-pTabPage->get(m_pNF_Degree,"degree");
-pTabPage->get(m_pNF_Period,"period");
-pTabPage->get(m_pEE_Name,"entry_name");
-pTabPage->get(m_pFmtFld_ExtrapolateForward,"extrapolateForward");
-pTabPage->get(m_pFmtFld_ExtrapolateBackward,"extrapolateBackward");
-pTabPage->get(m_pCB_SetIntercept,"setIntercept");
-pTabPage->get(m_pFmtFld_InterceptValue,"interceptValue");
-pTabPage->get(m_pCB_ShowEquation,"showEquation");
-pTabPage->get(m_pEE_XName,"entry_Xname");
-pTabPage->get(m_pEE_YName,"entry_Yname");
-pTabPage->get(m_pCB_ShowCorrelationCoeff,"showCorrelationCoefficient");
-pTabPage->get(m_pFI_Linear,"imageLinear");
-pTabPage->get(m_pFI_Logarithmic,"imageLogarithmic");
-pTabPage->get(m_pFI_Exponential,"imageExponential");

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig include/sfx2 include/vcl sd/uiconfig sfx2/source vcl/source vcl/unx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx|  368 +--
 chart2/source/controller/inc/dlg_ObjectProperties.hxx|   10 
 chart2/source/controller/main/ChartController_Insert.cxx |   18 
 chart2/source/controller/main/ChartController_Properties.cxx |   12 
 chart2/uiconfig/ui/attributedialog.ui|   33 
 include/sfx2/tabdlg.hxx  |   15 
 include/vcl/weld.hxx |1 
 sd/uiconfig/simpress/ui/templatedialog.ui|4 
 sfx2/source/dialog/tabdlg.cxx|   41 -
 vcl/source/app/salvtables.cxx|   23 
 vcl/unx/gtk3/gtk3gtkinst.cxx |   16 
 11 files changed, 290 insertions(+), 251 deletions(-)

New commits:
commit 8947c9b1d8cd407131fdfb6fc3c77c8532e9d2a0
Author: Caolán McNamara 
AuthorDate: Thu Oct 18 13:00:41 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 20 13:52:34 2018 +0200

weld SchAttribTabDlg

Change-Id: Ia53547b7b42a3ff8848085ab8f8d214259d5cc7b
Reviewed-on: https://gerrit.libreoffice.org/61959
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 47315d30a9ce..114d0cf97612 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -318,13 +318,12 @@ void 
SchAttribTabDlg::SetAxisMinorStepWidthForErrorBarDecimals( double fMinorSte
 m_fAxisMinorStepWidthForErrorBarDecimals = fMinorStepWidth;
 }
 
-SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
+SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent,
  const SfxItemSet* pAttr,
  const ObjectPropertiesDialogParameter* 
pDialogParameter,
  const ViewElementListProvider* 
pViewElementListProvider,
- const uno::Reference< 
util::XNumberFormatsSupplier >& xNumberFormatsSupplier
- )
-: SfxTabDialog(pParent, "AttributeDialog", 
"modules/schart/ui/attributedialog.ui", pAttr)
+ const uno::Reference< 
util::XNumberFormatsSupplier >& xNumberFormatsSupplier)
+: SfxTabDialogController(pParent, "modules/schart/ui/attributedialog.ui", 
"AttributeDialog", pAttr)
 , nDlgType(nNoArrowNoShadowDlg)
 , m_pParameter( pDialogParameter )
 , m_pViewElementListProvider( pViewElementListProvider )
@@ -335,89 +334,89 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent,
 NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier );
 m_pNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter();
 
-SetText( pDialogParameter->getLocalizedName() );
+m_xDialog->set_title(pDialogParameter->getLocalizedName());
 
 SvtCJKOptions aCJKOptions;
 
 switch (pDialogParameter->getObjectType())
 {
 case OBJECTTYPE_TITLE:
-AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
-AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
-AddTabPage(RID_SVXPAGE_TRANSPARENCE, 
SchResId(STR_PAGE_TRANSPARENCY));
-AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
-AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, 
SchResId(STR_PAGE_FONT_EFFECTS));
-AddTabPage(TP_ALIGNMENT, SchResId(STR_PAGE_ALIGNMENT), 
SchAlignmentTabPage::Create);
+AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE);
+AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA);
+AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), 
RID_SVXPAGE_TRANSPARENCE);
+AddTabPage("fontname", SchResId(STR_PAGE_FONT), 
RID_SVXPAGE_CHAR_NAME);
+AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), 
RID_SVXPAGE_CHAR_EFFECTS);
+AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), 
SchAlignmentTabPage::Create, nullptr);
 if( aCJKOptions.IsAsianTypographyEnabled() )
-AddTabPage(RID_SVXPAGE_PARA_ASIAN, SchResId(STR_PAGE_ASIAN));
+AddTabPage("asian", SchResId(STR_PAGE_ASIAN), 
RID_SVXPAGE_PARA_ASIAN);
 break;
 
 case OBJECTTYPE_LEGEND:
-AddTabPage(RID_SVXPAGE_LINE, SchResId(STR_PAGE_BORDER));
-AddTabPage(RID_SVXPAGE_AREA, SchResId(STR_PAGE_AREA));
-AddTabPage(RID_SVXPAGE_TRANSPARENCE, 
SchResId(STR_PAGE_TRANSPARENCY));
-AddTabPage(RID_SVXPAGE_CHAR_NAME, SchResId(STR_PAGE_FONT));
-AddTabPage(RID_SVXPAGE_CHAR_EFFECTS, 
SchResId(STR_PAGE_FONT_EFFECTS));
-AddTabPage(TP_LEGEND_POS, SchResId(STR_PAGE_POSITION), 
SchLegendPosTabPage::Create);
-if( 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_DataSource.cxx  |4 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx |  223 ---
 chart2/source/controller/dialogs/tp_RangeChooser.hxx |   52 +---
 chart2/uiconfig/ui/tp_RangeChooser.ui|   43 +--
 4 files changed, 139 insertions(+), 183 deletions(-)

New commits:
commit aa75bf8b11c6e2e4fd7e9988c3c9d7db2420389a
Author: Caolán McNamara 
AuthorDate: Mon Oct 15 15:09:32 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 15 21:03:34 2018 +0200

weld RangeChooserTabPage

Change-Id: I3006d215cc734d28b208c0c4e8b9c719b70d4954
Reviewed-on: https://gerrit.libreoffice.org/61799
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx 
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 4e2f6062f71c..f71abafffebf 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -135,9 +135,9 @@ DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
 
 m_pTabControl->Show();
 
-m_pRangeChooserTabPage = VclPtr::Create( 
m_pTabControl, *(m_apDialogModel.get()),
+m_pRangeChooserTabPage = 
VclPtr::Create(TabPageParent(m_pTabControl), 
*(m_apDialogModel.get()),
  m_apDocTemplateProvider.get(), this, true 
/* bHideDescription */ );
-m_pDataSourceTabPage = VclPtr::Create( m_pTabControl, 
*(m_apDialogModel.get()),
+m_pDataSourceTabPage = VclPtr::Create(m_pTabControl, 
*(m_apDialogModel.get()),
 m_apDocTemplateProvider.get(), this, true 
/* bHideDescription */ );
 
 m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE) 
);
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx 
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index a0776b6fff24..838d4df9fdd7 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -31,12 +31,12 @@
 namespace
 {
 void lcl_ShowChooserButton(
-PushButton& rChooserButton,
+weld::Button& rChooserButton,
 bool bShow)
 {
-if( rChooserButton.IsVisible() != bShow )
+if( rChooserButton.get_visible() != bShow )
 {
-rChooserButton.Show( bShow );
+rChooserButton.show( bShow );
 }
 }
 
@@ -58,46 +58,41 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Sequence;
 
-RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent
-, DialogModel & rDialogModel
-, ChartTypeTemplateProvider* pTemplateProvider
-, Dialog * pParentDialog
-, bool bHideDescription /* = false */ )
-: OWizardPage( pParent
-,"tp_RangeChooser"
-,"modules/schart/ui/tp_RangeChooser.ui")
-, m_nChangingControlCalls(0)
-, m_bIsDirty(false)
-, m_aLastValidRangeString()
-, m_pTemplateProvider(pTemplateProvider)
-, m_rDialogModel( rDialogModel )
-, m_pParentDialog( pParentDialog )
-, m_pTabPageNotifiable( dynamic_cast< TabPageNotifiable * >( 
pParentDialog ))
+RangeChooserTabPage::RangeChooserTabPage(TabPageParent pParent, DialogModel & 
rDialogModel,
+ ChartTypeTemplateProvider* 
pTemplateProvider,
+ Dialog * pParentDialog, bool 
bHideDescription /* = false */)
+: OWizardPage(pParent, "modules/schart/ui/tp_RangeChooser.ui", 
"tp_RangeChooser")
+, m_nChangingControlCalls(0)
+, m_bIsDirty(false)
+, m_aLastValidRangeString()
+, m_pTemplateProvider(pTemplateProvider)
+, m_rDialogModel( rDialogModel )
+, m_pParentDialog( pParentDialog )
+, m_pTabPageNotifiable( dynamic_cast< TabPageNotifiable * >( pParentDialog 
))
+, m_xFT_Caption(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
+, m_xFT_Range(m_xBuilder->weld_label("FT_RANGE"))
+, m_xED_Range(m_xBuilder->weld_entry("ED_RANGE"))
+, m_xIB_Range(m_xBuilder->weld_button("IB_RANGE"))
+, m_xRB_Rows(m_xBuilder->weld_radio_button("RB_DATAROWS"))
+, m_xRB_Columns(m_xBuilder->weld_radio_button("RB_DATACOLS"))
+, 
m_xCB_FirstRowAsLabel(m_xBuilder->weld_check_button("CB_FIRST_ROW_ASLABELS"))
+, 
m_xCB_FirstColumnAsLabel(m_xBuilder->weld_check_button("CB_FIRST_COLUMN_ASLABELS"))
+, m_xFTTitle(m_xBuilder->weld_label("STR_PAGE_DATA_RANGE"))
+, m_xFL_TimeBased(m_xBuilder->weld_widget("separator1"))
+, m_xCB_TimeBased(m_xBuilder->weld_check_button("CB_TIME_BASED"))
+, m_xFT_TimeStart(m_xBuilder->weld_label("label1"))
+, m_xEd_TimeStart(m_xBuilder->weld_entry("ED_TIME_BASED_START"))
+, m_xFT_TimeEnd(m_xBuilder->weld_label("label2"))
+, m_xEd_TimeEnd(m_xBuilder->weld_entry("ED_TIME_BASED_END"))
 {
-get(m_pFT_Caption, "FT_CAPTION_FOR_WIZARD");
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/res_LegendPosition.cxx |  100 ++---
 chart2/source/controller/dialogs/res_Titles.cxx |  180 
--
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |   72 +---
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |   21 -
 chart2/source/controller/inc/res_LegendPosition.hxx |   25 -
 chart2/source/controller/inc/res_Titles.hxx |   44 +-
 chart2/uiconfig/ui/wizelementspage.ui   |   80 +---
 7 files changed, 219 insertions(+), 303 deletions(-)

New commits:
commit 27a5f7d36874b6a20f5cae27d9b583b821a7cb8f
Author: Caolán McNamara 
AuthorDate: Mon Oct 15 14:14:30 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 15 21:03:16 2018 +0200

weld TitlesAndObjectsTabPage

Change-Id: I071ddf117e44fab3b5f712198973c86a0fd8d206
Reviewed-on: https://gerrit.libreoffice.org/61798
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx 
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 8eab04a77e0f..5842b0e2206f 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -39,37 +39,34 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-LegendPositionResources::LegendPositionResources(VclBuilderContainer& rParent)
-: m_xCC() //unused in this scenario
-, m_pCbxShow( nullptr ) //unused in this scenario, assumed to be visible
+LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder)
+: m_xRbtLeft(rBuilder.weld_radio_button("left"))
+, m_xRbtRight(rBuilder.weld_radio_button("right"))
+, m_xRbtTop(rBuilder.weld_radio_button("top"))
+, m_xRbtBottom(rBuilder.weld_radio_button("bottom"))
 {
-rParent.get(m_pRbtLeft, "left");
-rParent.get(m_pRbtRight, "right");
-rParent.get(m_pRbtTop, "top");
-rParent.get(m_pRbtBottom, "bottom");
 impl_setRadioButtonToggleHdl();
 }
 
-LegendPositionResources::LegendPositionResources(VclBuilderContainer& rParent,
+LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder,
 const uno::Reference< uno::XComponentContext >& xCC)
 : m_xCC(xCC)
+, m_xCbxShow(rBuilder.weld_check_button("show"))
+, m_xRbtLeft(rBuilder.weld_radio_button("left"))
+, m_xRbtRight(rBuilder.weld_radio_button("right"))
+, m_xRbtTop(rBuilder.weld_radio_button("top"))
+, m_xRbtBottom(rBuilder.weld_radio_button("bottom"))
 {
-rParent.get(m_pCbxShow, "show");
-rParent.get(m_pRbtLeft, "left");
-rParent.get(m_pRbtRight, "right");
-rParent.get(m_pRbtTop, "top");
-rParent.get(m_pRbtBottom, "bottom");
-
-m_pCbxShow->SetToggleHdl( LINK( this, LegendPositionResources, 
PositionEnableHdl ) );
+m_xCbxShow->connect_toggled( LINK( this, LegendPositionResources, 
PositionEnableHdl ) );
 impl_setRadioButtonToggleHdl();
 }
 
 void LegendPositionResources::impl_setRadioButtonToggleHdl()
 {
-m_pRbtLeft->SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
-m_pRbtTop->SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
-m_pRbtRight->SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
-m_pRbtBottom->SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_xRbtLeft->connect_toggled( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_xRbtTop->connect_toggled( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_xRbtRight->connect_toggled( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_xRbtBottom->connect_toggled( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
 }
 
 LegendPositionResources::~LegendPositionResources()
@@ -87,9 +84,9 @@ void LegendPositionResources::writeToResources( const 
uno::Reference< frame::XMo
 //show
 bool bShowLegend = false;
 xProp->getPropertyValue( "Show" ) >>= bShowLegend;
-if (m_pCbxShow)
-m_pCbxShow->Check( bShowLegend );
-PositionEnableHdl(*m_pCbxShow);
+if (m_xCbxShow)
+m_xCbxShow->set_active( bShowLegend );
+PositionEnableHdl(*m_xCbxShow);
 
 //position
 chart2::LegendPosition ePos;
@@ -97,21 +94,20 @@ void LegendPositionResources::writeToResources( const 
uno::Reference< frame::XMo
 switch( ePos )
 {
 case chart2::LegendPosition_LINE_START:
-m_pRbtLeft->Check();
+m_xRbtLeft->set_active(true);
 break;
 case chart2::LegendPosition_LINE_END:
-m_pRbtRight->Check();
+m_xRbtRight->set_active(true);
 break;
 case 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig include/sfx2 include/svtools include/vcl svtools/source vcl/unx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |  131 +--
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx |   83 +-
 chart2/source/controller/dialogs/dlg_ChartType.cxx |   26 
 chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx |3 
 chart2/source/controller/dialogs/res_BarGeometry.cxx   |   37 -
 chart2/source/controller/dialogs/res_BarGeometry.hxx   |   21 
 chart2/source/controller/dialogs/tp_ChartType.cxx  |  353 
+-
 chart2/source/controller/dialogs/tp_ChartType.hxx  |   15 
 chart2/source/controller/dialogs/tp_PointGeometry.cxx  |   22 
 chart2/source/controller/dialogs/tp_PointGeometry.hxx  |2 
 chart2/source/controller/inc/dlg_ChartType.hxx |   15 
 chart2/source/controller/main/ChartController.cxx  |4 
 chart2/uiconfig/ui/charttypedialog.ui  |8 
 chart2/uiconfig/ui/tp_ChartType.ui |  188 +++--
 include/sfx2/tabdlg.hxx|   25 
 include/svtools/valueset.hxx   |2 
 include/svtools/wizardmachine.hxx  |6 
 include/vcl/tabpage.hxx|   25 
 svtools/source/control/valueset.cxx|9 
 svtools/source/dialogs/wizardmachine.cxx   |   19 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   24 
 21 files changed, 544 insertions(+), 474 deletions(-)

New commits:
commit ec548bce309d965a25e807ae79432114926e06f3
Author: Caolán McNamara 
AuthorDate: Mon Oct 15 11:14:02 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 15 21:02:23 2018 +0200

weld ChartTypeDialog and SchLayoutTabPage

Change-Id: I101c56b855d0bdc43559ca4561d298fa4ad92572
Reviewed-on: https://gerrit.libreoffice.org/61797
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx 
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 6e330aa3d45b..db42744007aa 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -117,10 +117,7 @@ ChartTypeDialogController::ChartTypeDialogController()
 ChartTypeDialogController::~ChartTypeDialogController()
 {
 }
-Image ChartTypeDialogController::getImage()
-{
-return Image();
-}
+
 bool ChartTypeDialogController::isSubType( const OUString& rServiceName )
 {
 const tTemplateServiceChartTypeParameterMap& rTemplateMap = 
getTemplateMap();
@@ -337,7 +334,7 @@ void ChartTypeDialogController::commitToModel( const 
ChartTypeParameter& rParame
 }
 }
 }
-void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const 
ChartTypeParameter& /*rParameter*/ )
+void ChartTypeDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, 
const ChartTypeParameter& /*rParameter*/ )
 {
 rSubTypeList.Clear();
 }
@@ -366,7 +363,7 @@ bool 
ChartTypeDialogController::shouldShow_SortByXValuesResourceGroup() const
 return false;
 }
 
-void ChartTypeDialogController::showExtraControls( VclBuilderContainer* 
/*pParent*/ )
+void ChartTypeDialogController::showExtraControls(weld::Builder* /*pBuilder*/)
 {
 }
 void ChartTypeDialogController::hideExtraControls() const
@@ -411,12 +408,12 @@ 
ColumnChartDialogController::~ColumnChartDialogController()
 }
 OUString ColumnChartDialogController::getName()
 {
-return SchResId( STR_TYPE_COLUMN );
+return SchResId(STR_TYPE_COLUMN);
 }
 
-Image ColumnChartDialogController::getImage()
+OUString ColumnChartDialogController::getImage()
 {
-return Image(BitmapEx(BMP_TYPE_COLUMN));
+return OUStringLiteral(BMP_TYPE_COLUMN);
 }
 
 const tTemplateServiceChartTypeParameterMap& 
ColumnChartDialogController::getTemplateMap() const
@@ -431,7 +428,7 @@ const tTemplateServiceChartTypeParameterMap& 
ColumnChartDialogController::getTem
 {"com.sun.star.chart2.template.ThreeDColumnDeep" ,   
ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z)}};
 return s_aTemplateMap;
 }
-void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, 
const ChartTypeParameter& rParameter )
+void ColumnChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList, 
const ChartTypeParameter& rParameter )
 {
 rSubTypeList.Clear();
 
@@ -488,12 +485,12 @@ BarChartDialogController::~BarChartDialogController()
 
 OUString BarChartDialogController::getName()
 {
-return SchResId( STR_TYPE_BAR );
+return SchResId(STR_TYPE_BAR);
 }
 
-Image BarChartDialogController::getImage()
+OUString BarChartDialogController::getImage()
 {
-return Image(BitmapEx(BMP_TYPE_BAR));
+return OUStringLiteral(BMP_TYPE_BAR);
 }
 
 const tTemplateServiceChartTypeParameterMap& 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig include/vcl vcl/source vcl/unx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx |   22 
 chart2/source/controller/dialogs/res_ErrorBar.cxx|  436 +++
 chart2/source/controller/dialogs/tp_ErrorBars.cxx|   18 
 chart2/source/controller/dialogs/tp_ErrorBars.hxx|2 
 chart2/source/controller/inc/dlg_InsertErrorBars.hxx |   11 
 chart2/source/controller/inc/res_ErrorBar.hxx|   94 +--
 chart2/source/controller/main/ChartController_Insert.cxx |   10 
 chart2/uiconfig/ui/dlg_InsertErrorBars.ui|  110 +--
 chart2/uiconfig/ui/tp_ErrorBars.ui   |  116 +--
 include/vcl/weld.hxx |1 
 vcl/source/app/salvtables.cxx|   10 
 vcl/unx/gtk3/gtk3gtkinst.cxx |5 
 12 files changed, 391 insertions(+), 444 deletions(-)

New commits:
commit 1c4a99648988ee39ce2c6a79981885e775f0d08c
Author: Caolán McNamara 
AuthorDate: Sun Oct 14 16:49:08 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 15 17:07:29 2018 +0200

weld InsertErrorBarsDialog and ErrorBarsTabPage

Change-Id: I3fb2fb4d8010e43e59b4de5c488f137960bc6417
Reviewed-on: https://gerrit.libreoffice.org/61760
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx 
b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index dc93eff7d44b..084ada9c74aa 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -39,19 +39,17 @@ namespace chart
 {
 
 InsertErrorBarsDialog::InsertErrorBarsDialog(
-vcl::Window* pParent, const SfxItemSet& rMyAttrs,
+weld::Window* pParent, const SfxItemSet& rMyAttrs,
 const uno::Reference< chart2::XChartDocument > & xChartDocument,
-ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y 
*/ ) :
-ModalDialog( pParent
-,"dlg_InsertErrorBars"
-,"modules/schart/ui/dlg_InsertErrorBars.ui"),
-m_apErrorBarResources( new ErrorBarResources(
-   this, this, rMyAttrs,
+ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y 
*/ )
+: GenericDialogController(pParent, 
"modules/schart/ui/dlg_InsertErrorBars.ui", "dlg_InsertErrorBars")
+, m_apErrorBarResources( new ErrorBarResources(
+   m_xBuilder.get(), 
TabPageParent(m_xDialog.get(), nullptr), rMyAttrs,
/* bNoneAvailable = */ true, eType ))
 {
 ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? 
OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
 
-SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) );
+
m_xDialog->set_title(ObjectNameProvider::getName_ObjectForAllSeries(objType));
 
 m_apErrorBarResources->SetChartDocumentForRangeChoosing( xChartDocument );
 }
@@ -61,14 +59,6 @@ void InsertErrorBarsDialog::FillItemSet(SfxItemSet& 
rOutAttrs)
 m_apErrorBarResources->FillItemSet(rOutAttrs);
 }
 
-void InsertErrorBarsDialog::DataChanged( const DataChangedEvent& rDCEvt )
-{
-ModalDialog::DataChanged( rDCEvt );
-
-if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && 
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
-m_apErrorBarResources->FillValueSets();
-}
-
 void InsertErrorBarsDialog::SetAxisMinorStepWidthForErrorBarDecimals( double 
fMinorStepWidth )
 {
 m_apErrorBarResources->SetAxisMinorStepWidthForErrorBarDecimals( 
fMinorStepWidth );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx 
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 52b2c8401a41..ea7f55413225 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -38,12 +38,17 @@ using namespace ::com::sun::star;
 
 namespace
 {
-void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog )
+void lcl_enableRangeChoosing(bool bEnable, TabPageParent pParent)
 {
-if( pDialog )
+if (weld::Window* pWeldDialog = dynamic_cast(pParent.pPage))
 {
-pDialog->Show( !bEnable );
-pDialog->SetModalInputMode( !bEnable );
+pWeldDialog->set_modal(!bEnable);
+pWeldDialog->show(!bEnable);
+}
+else if (::Dialog* pVCLDialog = pParent.pParent ? 
pParent.pParent->GetParentDialog() : nullptr)
+{
+pVCLDialog->Show(!bEnable);
+pVCLDialog->SetModalInputMode(!bEnable);
 }
 }
 
@@ -79,78 +84,74 @@ sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError 
eErrorKind )
 namespace chart
 {
 
-ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * 
pParentDialog,
-  const SfxItemSet& rInAttrs, bool 
bNoneAvailable,
-  tErrorBarType eType /* = ERROR_BAR_Y */ 
) :
-m_eErrorKind( 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_TitleRotation.cxx |   75 ++
 chart2/source/controller/dialogs/tp_TitleRotation.hxx |   23 +++--
 chart2/uiconfig/ui/titlerotationtabpage.ui|   21 -
 3 files changed, 72 insertions(+), 47 deletions(-)

New commits:
commit 9886625d02fee7692ff94e7c5b63dc2f51e31fa1
Author: Caolán McNamara 
AuthorDate: Sat Oct 13 17:49:24 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 13 22:42:27 2018 +0200

weld SchAlignmentTabPage

Change-Id: I9b67720b087d2d89dd1a64933b0e073132e601b7
Reviewed-on: https://gerrit.libreoffice.org/61745
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx 
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index f2d60eac5f60..79c696968322 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -29,30 +29,44 @@
 namespace chart
 {
 
-SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow,
- const SfxItemSet& rInAttrs, bool 
bWithRotation) :
-SfxTabPage(pWindow, 
"TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", )
+SchAlignmentTabPage::SchAlignmentTabPage(TabPageParent pParent,
+ const SfxItemSet& rInAttrs, bool 
bWithRotation)
+: SfxTabPage(pParent, "modules/schart/ui/titlerotationtabpage.ui", 
"TitleRotationTabPage", )
+, m_xFtRotate(m_xBuilder->weld_label("degreeL"))
+, m_xNfRotate(m_xBuilder->weld_spin_button("OrientDegree"))
+, m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
+, m_xFtTextDirection(m_xBuilder->weld_label("textdirL"))
+, m_xFtABCD(m_xBuilder->weld_label("labelABCD"))
+, m_xLbTextDirection(new 
SchTextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
+, m_xCtrlDial(new weld::CustomWeld(*m_xBuilder, "dialCtrl", m_aCtrlDial))
 {
-get(m_pCtrlDial,"dialCtrl");
-get(m_pFtRotate,"degreeL");
-get(m_pNfRotate,"OrientDegree");
-get(m_pCbStacked,"stackedCB");
-get(m_pFtTextDirection,"textdirL");
-get(m_pLbTextDirection,"textdirLB");
-get(m_pFtABCD,"labelABCD");
-m_pCtrlDial->SetText(m_pFtABCD->GetText());
-m_pOrientHlp.reset( new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, 
*m_pCbStacked) );
-
-m_pCbStacked->EnableTriState( false );
-m_pOrientHlp->Enable();
-m_pOrientHlp->AddDependentWindow( *m_pFtRotate, TRISTATE_TRUE );
+m_aCtrlDial.SetLinkedField(m_xNfRotate.get());
+m_aCtrlDial.SetText(m_xFtABCD->get_label());
+m_xCbStacked->connect_toggled(LINK(this, SchAlignmentTabPage, 
StackedToggleHdl));
+
+m_xCtrlDial->set_sensitive(true);
+m_xNfRotate->set_sensitive(true);
+m_xCbStacked->set_sensitive(true);
+m_xFtRotate->set_sensitive(true);
 
 if( !bWithRotation )
 {
-m_pOrientHlp->Hide();
+m_xCtrlDial->hide();
+m_xNfRotate->hide();
+m_xCbStacked->hide();
+m_xFtRotate->hide();
 }
 }
 
+IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&, 
void)
+{
+bool bActive = m_xCbStacked->get_active();
+m_xNfRotate->set_sensitive(bActive);
+m_xCtrlDial->set_sensitive(bActive);
+m_aCtrlDial.StyleUpdated();
+m_xFtRotate->set_sensitive(bActive);
+}
+
 SchAlignmentTabPage::~SchAlignmentTabPage()
 {
 disposeOnce();
@@ -60,39 +74,33 @@ SchAlignmentTabPage::~SchAlignmentTabPage()
 
 void SchAlignmentTabPage::dispose()
 {
-m_pOrientHlp.reset();
-m_pCtrlDial.clear();
-m_pFtRotate.clear();
-m_pNfRotate.clear();
-m_pCbStacked.clear();
-m_pFtTextDirection.clear();
-m_pLbTextDirection.clear();
-m_pFtABCD.clear();
+m_xCtrlDial.reset();
+m_xLbTextDirection.reset();
 SfxTabPage::dispose();
 }
 
 VclPtr SchAlignmentTabPage::Create(TabPageParent pParent,
const SfxItemSet* rInAttrs)
 {
-return VclPtr::Create(pParent.pParent, *rInAttrs);
+return VclPtr::Create(pParent, *rInAttrs);
 }
 
 VclPtr SchAlignmentTabPage::CreateWithoutRotation(TabPageParent 
pParent,
   const 
SfxItemSet* rInAttrs)
 {
-return VclPtr::Create(pParent.pParent, *rInAttrs, 
false);
+return VclPtr::Create(pParent, *rInAttrs, false);
 }
 
 bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
 {
 //Since 04/1998 text can be rotated by an arbitrary angle: 
SCHATTR_TEXT_DEGREES
-bool bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE;
+bool bStacked = m_xCbStacked->get_active();
 rOutAttrs->Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
 
-sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation();
+sal_Int32 nDegrees = bStacked ? 0 : m_aCtrlDial.GetRotation();
 rOutAttrs->Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig include/svx

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/TextDirectionListBox.cxx |   13 
 chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx  |8 
 chart2/source/controller/dialogs/res_DataLabel.cxx|  220 ++
 chart2/source/controller/dialogs/res_DataLabel.hxx|   55 +--
 chart2/source/controller/dialogs/tp_DataLabel.cxx |   13 
 chart2/source/controller/dialogs/tp_DataLabel.hxx |2 
 chart2/source/controller/inc/TextDirectionListBox.hxx |7 
 chart2/source/controller/inc/dlg_InsertDataLabel.hxx  |   11 
 chart2/source/controller/main/ChartController_Insert.cxx  |6 
 chart2/uiconfig/ui/dlg_DataLabel.ui   |  172 --
 chart2/uiconfig/ui/tp_DataLabel.ui|  189 +++-
 include/svx/frmdirlbox.hxx|1 
 12 files changed, 292 insertions(+), 405 deletions(-)

New commits:
commit f7a2e12cb582bda905a75fc547ad632c9b371d06
Author: Caolán McNamara 
AuthorDate: Fri Oct 12 16:39:16 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 13 00:51:26 2018 +0200

weld DataLabelsDialog and DataLabelsTabPage

Change-Id: I509d58b2677b5e8f0db476e2650661cb128a5279
Reviewed-on: https://gerrit.libreoffice.org/61723
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx 
b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 1fd5b7604c10..a622e2b651d2 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -42,6 +42,19 @@ TextDirectionListBox::TextDirectionListBox( vcl::Window* 
pParent ) :
 
 VCL_BUILDER_FACTORY(TextDirectionListBox)
 
+SchTextDirectionListBox::SchTextDirectionListBox(std::unique_ptr
 pControl)
+: svx::SvxFrameDirectionListBox(std::move(pControl))
+{
+append(SvxFrameDirection::Horizontal_LR_TB, 
SchResId(STR_TEXT_DIRECTION_LTR));
+append(SvxFrameDirection::Horizontal_RL_TB, 
SchResId(STR_TEXT_DIRECTION_RTL));
+append(SvxFrameDirection::Environment, SchResId(STR_TEXT_DIRECTION_SUPER));
+
+if (!SvtLanguageOptions().IsCTLFontEnabled())
+{
+hide();
+}
+}
+
 } //namespace chart
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx 
b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 4bfb943fddc9..57817d883d66 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -23,11 +23,9 @@
 namespace chart
 {
 
-DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& 
rInAttrs, SvNumberFormatter* pFormatter) :
-ModalDialog(pWindow
-,"dlg_DataLabels"
-,"modules/schart/ui/dlg_DataLabel.ui"),
-m_apDataLabelResources( new DataLabelResources(this, GetFrameWeld(), 
rInAttrs) )
+DataLabelsDialog::DataLabelsDialog(weld::Window* pWindow, const SfxItemSet& 
rInAttrs, SvNumberFormatter* pFormatter)
+: GenericDialogController(pWindow, "modules/schart/ui/dlg_DataLabel.ui", 
"dlg_DataLabels")
+, m_apDataLabelResources(new DataLabelResources(m_xBuilder.get(), pWindow, 
rInAttrs))
 {
 m_apDataLabelResources->SetNumberFormatter( pFormatter );
 m_apDataLabelResources->Reset(rInAttrs);
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 95094b4b8d8a..e44a346a0a46 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -69,65 +69,54 @@ bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& 
rSet, sal_uInt16 nValueW
 return bSet;
 }
 
-void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 
nWhichId, CheckBox& rCheckbox )
+void lcl_setBoolItemToCheckBox(const SfxItemSet& rInAttrs, sal_uInt16 
nWhichId, weld::CheckButton& rCheckbox)
 {
-rCheckbox.EnableTriState( false );
-
 const SfxPoolItem *pPoolItem = nullptr;
 if( rInAttrs.GetItemState(nWhichId, true, ) == SfxItemState::SET 
)
-rCheckbox.Check( static_cast(pPoolItem)->GetValue() );
+rCheckbox.set_active(static_cast(pPoolItem)->GetValue());
 else
-{
-rCheckbox.EnableTriState();
-rCheckbox.SetState( TRISTATE_INDET );
-}
+rCheckbox.set_state(TRISTATE_INDET);
 }
 
 }//end anonymous namespace
 
-DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, 
weld::Window* pParent, const SfxItemSet& rInAttrs )
-:
-m_pNumberFormatter(nullptr),
-m_bNumberFormatMixedState(true),
-m_bPercentFormatMixedState(true),
-m_nNumberFormatForValue(0),
-m_nNumberFormatForPercent(11),
-m_bSourceFormatMixedState(true),
-m_bPercentSourceMixedState(true),
-m_bSourceFormatForValue(true),
-m_bSourceFormatForPercent(true),
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_InsertLegend.cxx|8 
 chart2/source/controller/dialogs/res_LegendPosition.cxx  |  200 +++
 chart2/source/controller/inc/dlg_InsertLegend.hxx|8 
 chart2/source/controller/inc/res_LegendPosition.hxx  |   38 ++
 chart2/source/controller/main/ChartController_Insert.cxx |8 
 chart2/uiconfig/ui/dlg_InsertLegend.ui   |   16 -
 6 files changed, 260 insertions(+), 18 deletions(-)

New commits:
commit a57f67f1773f6693f07352fcb232460350d0d091
Author: Caolán McNamara 
AuthorDate: Thu Oct 4 09:55:10 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 4 15:42:20 2018 +0200

weld SchLegendDlg

Change-Id: Ie57d195782d9fbfdf555205e53e733529b4c1ae8
Reviewed-on: https://gerrit.libreoffice.org/61360
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx 
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 32acbeac5784..51b95fe3f46a 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -25,11 +25,9 @@ namespace chart
 
 using namespace ::com::sun::star;
 
-SchLegendDlg::SchLegendDlg(vcl::Window* pWindow, const uno::Reference< 
uno::XComponentContext>& xCC )
-: ModalDialog(pWindow
-,"dlg_InsertLegend"
-,"modules/schart/ui/dlg_InsertLegend.ui")
-, m_xLegendPositionResources( new LegendPositionResources(*this,xCC) )
+SchLegendDlg::SchLegendDlg(weld::Window* pWindow, const uno::Reference< 
uno::XComponentContext>& xCC)
+: GenericDialogController(pWindow, 
"modules/schart/ui/dlg_InsertLegend.ui", "dlg_InsertLegend")
+, m_xLegendPositionResources(new SchLegendPositionResources(*m_xBuilder, 
xCC))
 {
 }
 
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx 
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index cca59f0b639b..0d6963266ec9 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -240,6 +240,206 @@ void LegendPositionResources::SetChangeHdl( const 
Link& rLi
 m_aChangeLink = rLink;
 }
 
+SchLegendPositionResources::SchLegendPositionResources(weld::Builder& rBuilder)
+: m_xCC() // unused in this scenario
+, m_xCbxShow() // unused in this scenario, assumed to be visible
+, m_xRbtLeft(rBuilder.weld_radio_button("left"))
+, m_xRbtRight(rBuilder.weld_radio_button("right"))
+, m_xRbtTop(rBuilder.weld_radio_button("top"))
+, m_xRbtBottom(rBuilder.weld_radio_button("bottom"))
+{
+impl_setRadioButtonToggleHdl();
+}
+
+SchLegendPositionResources::SchLegendPositionResources(weld::Builder& rBuilder,
+const uno::Reference< uno::XComponentContext >& xCC)
+: m_xCC(xCC)
+, m_xCbxShow(rBuilder.weld_check_button("show"))
+, m_xRbtLeft(rBuilder.weld_radio_button("left"))
+, m_xRbtRight(rBuilder.weld_radio_button("right"))
+, m_xRbtTop(rBuilder.weld_radio_button("top"))
+, m_xRbtBottom(rBuilder.weld_radio_button("bottom"))
+{
+m_xCbxShow->connect_toggled(LINK(this, SchLegendPositionResources, 
PositionEnableHdl));
+impl_setRadioButtonToggleHdl();
+}
+
+void SchLegendPositionResources::impl_setRadioButtonToggleHdl()
+{
+m_xRbtLeft->connect_toggled(LINK(this, SchLegendPositionResources, 
PositionChangeHdl));
+m_xRbtTop->connect_toggled(LINK(this, SchLegendPositionResources, 
PositionChangeHdl));
+m_xRbtRight->connect_toggled(LINK(this, SchLegendPositionResources, 
PositionChangeHdl));
+m_xRbtBottom->connect_toggled(LINK(this, SchLegendPositionResources, 
PositionChangeHdl));
+}
+
+SchLegendPositionResources::~SchLegendPositionResources()
+{
+}
+
+void SchLegendPositionResources::writeToResources( const uno::Reference< 
frame::XModel >& xChartModel )
+{
+try
+{
+uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( 
xChartModel );
+uno::Reference< beans::XPropertySet > xProp( xDiagram->getLegend(), 
uno::UNO_QUERY );
+if( xProp.is() )
+{
+//show
+bool bShowLegend = false;
+xProp->getPropertyValue( "Show" ) >>= bShowLegend;
+if (m_xCbxShow)
+m_xCbxShow->set_active(bShowLegend);
+PositionEnableHdl(*m_xCbxShow);
+
+//position
+chart2::LegendPosition ePos;
+xProp->getPropertyValue( "AnchorPosition" )  >>= ePos;
+switch( ePos )
+{
+case chart2::LegendPosition_LINE_START:
+m_xRbtLeft->set_active(true);
+break;
+case chart2::LegendPosition_LINE_END:
+m_xRbtRight->set_active(true);
+break;
+case chart2::LegendPosition_PAGE_START:
+m_xRbtTop->set_active(true);
+break;
+

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_ChartType.cxx |   64 --
 chart2/uiconfig/ui/steppedlinesdlg.ui |9 ++-
 2 files changed, 33 insertions(+), 40 deletions(-)

New commits:
commit 3d4012a84c13448d1320f1e42ccb72de6bb9a480
Author: Caolán McNamara 
AuthorDate: Thu Oct 4 09:39:48 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 4 14:22:56 2018 +0200

weld SteppedPropertiesDialog

Change-Id: I6e5a5a76f4e7d0d8b71e7d2e3dee9f7c2815f5d5
Reviewed-on: https://gerrit.libreoffice.org/61357
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index e7ceacf6c43f..8782cfb643c2 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -333,41 +333,29 @@ IMPL_LINK_NOARG(SplinePropertiesDialog, 
SplineTypeListBoxHdl, weld::ComboBox&, v
 m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() == 
B_SPLINE_POS);
 }
 
-class SteppedPropertiesDialog : public ModalDialog
+class SteppedPropertiesDialog : public weld::GenericDialogController
 {
 public:
-explicit SteppedPropertiesDialog( vcl::Window* pParent );
-virtual ~SteppedPropertiesDialog() override { disposeOnce(); }
-virtual void dispose() override;
+explicit SteppedPropertiesDialog(weld::Window* pParent);
 
 void fillControls( const ChartTypeParameter& rParameter );
 void fillParameter( ChartTypeParameter& rParameter, bool bSteppedLines );
 
 private:
-VclPtr m_pRB_Start;
-VclPtr m_pRB_End;
-VclPtr m_pRB_CenterX;
-VclPtr m_pRB_CenterY;
+std::unique_ptr m_xRB_Start;
+std::unique_ptr m_xRB_End;
+std::unique_ptr m_xRB_CenterX;
+std::unique_ptr m_xRB_CenterY;
 };
 
-SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent )
-: ModalDialog( pParent, "SteppedLinesDialog", 
"modules/schart/ui/steppedlinesdlg.ui")
+SteppedPropertiesDialog::SteppedPropertiesDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/schart/ui/steppedlinesdlg.ui", 
"SteppedLinesDialog")
+, m_xRB_Start(m_xBuilder->weld_radio_button("step_start_rb"))
+, m_xRB_End(m_xBuilder->weld_radio_button("step_end_rb"))
+, m_xRB_CenterX(m_xBuilder->weld_radio_button("step_center_x_rb"))
+, m_xRB_CenterY(m_xBuilder->weld_radio_button("step_center_y_rb"))
 {
-get(m_pRB_Start, "step_start_rb");
-get(m_pRB_End, "step_end_rb");
-get(m_pRB_CenterX, "step_center_x_rb");
-get(m_pRB_CenterY, "step_center_y_rb");
-
-SetText(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
-}
-
-void SteppedPropertiesDialog::dispose()
-{
-m_pRB_Start.clear();
-m_pRB_End.clear();
-m_pRB_CenterX.clear();
-m_pRB_CenterY.clear();
-ModalDialog::dispose();
+m_xDialog->set_title(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
 }
 
 void SteppedPropertiesDialog::fillControls( const ChartTypeParameter& 
rParameter )
@@ -375,16 +363,16 @@ void SteppedPropertiesDialog::fillControls( const 
ChartTypeParameter& rParameter
 switch(rParameter.eCurveStyle)
 {
 case CurveStyle_STEP_END:
-m_pRB_End->Check();
+m_xRB_End->set_active(true);
 break;
 case CurveStyle_STEP_CENTER_X:
-m_pRB_CenterX->Check();
+m_xRB_CenterX->set_active(true);
 break;
 case CurveStyle_STEP_CENTER_Y:
-m_pRB_CenterY->Check();
+m_xRB_CenterY->set_active(true);
 break;
 default: // includes CurveStyle_STEP_START
-m_pRB_Start->Check();
+m_xRB_Start->set_active(true);
 break;
 }
 }
@@ -392,13 +380,13 @@ void SteppedPropertiesDialog::fillParameter( 
ChartTypeParameter& rParameter, boo
 {
 if (!bSteppedLines)
 rParameter.eCurveStyle=CurveStyle_LINES;
-else if(m_pRB_CenterY->IsChecked())
+else if(m_xRB_CenterY->get_active())
 rParameter.eCurveStyle=CurveStyle_STEP_CENTER_Y;
-else if(m_pRB_Start->IsChecked())
+else if(m_xRB_Start->get_active())
 rParameter.eCurveStyle=CurveStyle_STEP_START;
-else if(m_pRB_End->IsChecked())
+else if(m_xRB_End->get_active())
 rParameter.eCurveStyle=CurveStyle_STEP_END;
-else if(m_pRB_CenterX->IsChecked())
+else if(m_xRB_CenterX->get_active())
 rParameter.eCurveStyle=CurveStyle_STEP_CENTER_X;
 }
 
@@ -428,7 +416,7 @@ private:
 VclPtrm_pLB_LineType;
 VclPtr m_pPB_DetailsDialog;
 std::unique_ptr m_xSplinePropertiesDialog;
-VclPtr< SteppedPropertiesDialog > m_pSteppedPropertiesDialog;
+std::unique_ptr m_xSteppedPropertiesDialog;
 };
 
 SplineResourceGroup::SplineResourceGroup(VclBuilderContainer* pWindow)
@@ -453,11 +441,11 @@ SplinePropertiesDialog& 
SplineResourceGroup::getSplinePropertiesDialog()
 
 SteppedPropertiesDialog& 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_InsertTitle.cxx |8 -
 chart2/source/controller/dialogs/res_Titles.cxx  |   94 +++
 chart2/source/controller/inc/dlg_InsertTitle.hxx |8 -
 chart2/source/controller/inc/res_Titles.hxx  |   32 +
 chart2/source/controller/main/ChartController_Insert.cxx |6 
 chart2/uiconfig/ui/inserttitledlg.ui |   29 +++-
 6 files changed, 158 insertions(+), 19 deletions(-)

New commits:
commit d4e61b53fbdfa3b21f8cce981f6f98a6a1bf89b6
Author: Caolán McNamara 
AuthorDate: Thu Oct 4 09:31:26 2018 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 4 14:22:38 2018 +0200

weld SchTitleDlg

Change-Id: Ie4537b9b6d856178ae378473fda4a1b27a1ed0b5
Reviewed-on: https://gerrit.libreoffice.org/61356
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx 
b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 149555cac30e..c0d44e5cba9f 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -24,11 +24,11 @@
 namespace chart
 {
 
-SchTitleDlg::SchTitleDlg(vcl::Window* pWindow, const TitleDialogData& rInput )
-: ModalDialog(pWindow, "InsertTitleDialog", 
"modules/schart/ui/inserttitledlg.ui")
-, m_xTitleResources(new TitleResources(*this, true))
+SchTitleDlg::SchTitleDlg(weld::Window* pWindow, const TitleDialogData& rInput)
+: GenericDialogController(pWindow, "modules/schart/ui/inserttitledlg.ui", 
"InsertTitleDialog")
+, m_xTitleResources(new SchTitleResources(*m_xBuilder, true))
 {
-SetText( ObjectNameProvider::getName(OBJECTTYPE_TITLE, true));
+m_xDialog->set_title(ObjectNameProvider::getName(OBJECTTYPE_TITLE, true));
 m_xTitleResources->writeToResources( rInput );
 }
 
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx 
b/chart2/source/controller/dialogs/res_Titles.cxx
index 2ba28666fcbf..7feec41cc2d8 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -148,6 +148,100 @@ void TitleResources::readFromResources( TitleDialogData& 
rOutput )
 rOutput.aTextList[6] = m_pEd_SecondaryYAxis->GetText();
 }
 
+SchTitleResources::SchTitleResources(weld::Builder& rBuilder, bool 
bShowSecondaryAxesTitle)
+: m_xFT_Main(rBuilder.weld_label("labelMainTitle"))
+, m_xFT_Sub(rBuilder.weld_label("labelSubTitle"))
+, m_xEd_Main(rBuilder.weld_entry("maintitle"))
+, m_xEd_Sub(rBuilder.weld_entry("subtitle"))
+, m_xFT_XAxis(rBuilder.weld_label("labelPrimaryXaxis"))
+, m_xFT_YAxis(rBuilder.weld_label("labelPrimaryYaxis"))
+, m_xFT_ZAxis(rBuilder.weld_label("labelPrimaryZaxis"))
+, m_xEd_XAxis(rBuilder.weld_entry("primaryXaxis"))
+, m_xEd_YAxis(rBuilder.weld_entry("primaryYaxis"))
+, m_xEd_ZAxis(rBuilder.weld_entry("primaryZaxis"))
+, m_xFT_SecondaryXAxis(rBuilder.weld_label("labelSecondaryXAxis"))
+, m_xFT_SecondaryYAxis(rBuilder.weld_label("labelSecondaryYAxis"))
+, m_xEd_SecondaryXAxis(rBuilder.weld_entry("secondaryXaxis"))
+, m_xEd_SecondaryYAxis(rBuilder.weld_entry("secondaryYaxis"))
+{
+m_xFT_SecondaryXAxis->show(bShowSecondaryAxesTitle);
+m_xFT_SecondaryYAxis->show(bShowSecondaryAxesTitle);
+m_xEd_SecondaryXAxis->show(bShowSecondaryAxesTitle);
+m_xEd_SecondaryYAxis->show(bShowSecondaryAxesTitle);
+}
+
+SchTitleResources::~SchTitleResources()
+{
+}
+
+bool SchTitleResources::IsModified()
+{
+return m_xEd_Main->get_value_changed_from_saved()
+|| m_xEd_Sub->get_value_changed_from_saved()
+|| m_xEd_XAxis->get_value_changed_from_saved()
+|| m_xEd_YAxis->get_value_changed_from_saved()
+|| m_xEd_ZAxis->get_value_changed_from_saved()
+|| m_xEd_SecondaryXAxis->get_value_changed_from_saved()
+|| m_xEd_SecondaryYAxis->get_value_changed_from_saved();
+}
+
+void SchTitleResources::ClearModifyFlag()
+{
+m_xEd_Main->save_value();
+m_xEd_Sub->save_value();
+m_xEd_XAxis->save_value();
+m_xEd_YAxis->save_value();
+m_xEd_ZAxis->save_value();
+m_xEd_SecondaryXAxis->save_value();
+m_xEd_SecondaryYAxis->save_value();
+}
+
+void SchTitleResources::writeToResources( const TitleDialogData& rInput )
+{
+m_xFT_Main->set_sensitive( rInput.aPossibilityList[0] );
+m_xFT_Sub->set_sensitive( rInput.aPossibilityList[1] );
+m_xFT_XAxis->set_sensitive( rInput.aPossibilityList[2] );
+m_xFT_YAxis->set_sensitive( rInput.aPossibilityList[3] );
+m_xFT_ZAxis->set_sensitive( rInput.aPossibilityList[4] );
+m_xFT_SecondaryXAxis->set_sensitive( rInput.aPossibilityList[5] );
+m_xFT_SecondaryYAxis->set_sensitive( rInput.aPossibilityList[6] );
+
+m_xEd_Main->set_sensitive( rInput.aPossibilityList[0] );
+m_xEd_Sub->set_sensitive( rInput.aPossibilityList[1] );
+m_xEd_XAxis->set_sensitive( 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx |   12 -
 chart2/source/controller/inc/dlg_ShapeParagraph.hxx |7 
 chart2/source/controller/main/ShapeController.cxx   |6 
 chart2/uiconfig/ui/paradialog.ui|  128 ++--
 4 files changed, 125 insertions(+), 28 deletions(-)

New commits:
commit 80761fd7cd574a2d71b5b0aeead5d6920db56707
Author: Caolán McNamara 
AuthorDate: Mon Sep 17 12:43:17 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 19 11:41:18 2018 +0200

weld ShapeParagraphDialog

Change-Id: I8c3b3c0f6c0cfe133e1ec8eda8c10bbbaee5f010
Reviewed-on: https://gerrit.libreoffice.org/60584
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx 
b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index 76a665775741..b203e13b3d7c 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -30,11 +30,9 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* pParent,
+ShapeParagraphDialog::ShapeParagraphDialog(weld::Window* pParent,
 const SfxItemSet* pAttr)
-: SfxTabDialog(pParent, "ParagraphDialog",
-"modules/schart/ui/paradialog.ui", pAttr)
-, m_nTabPageId(0)
+: SfxTabDialogController(pParent, "modules/schart/ui/paradialog.ui", 
"ParagraphDialog", pAttr)
 {
 SvtCJKOptions aCJKOptions;
 
@@ -48,12 +46,12 @@ ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* 
pParent,
 {
 RemoveTabPage("labelTP_PARA_ASIAN");
 }
-m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
+AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
 }
 
-void ShapeParagraphDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
+void ShapeParagraphDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
 {
-if (nId == m_nTabPageId)
+if (rId == "labelTP_TABULATOR")
 {
 SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) );
 TabulatorDisableFlags const nFlags(( TabulatorDisableFlags::TypeMask 
&~TabulatorDisableFlags::TypeLeft ) |
diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx 
b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
index d47d7098c729..14fbf5f0cc8c 100644
--- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx
@@ -26,13 +26,12 @@ namespace chart
 
 /** dialog for paragraph properties of shapes
  */
-class ShapeParagraphDialog : public SfxTabDialog
+class ShapeParagraphDialog : public SfxTabDialogController
 {
 public:
-ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr);
+ShapeParagraphDialog(weld::Window* pParent, const SfxItemSet* pAttr);
 private:
-virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override;
-sal_uInt16 m_nTabPageId;
+virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/ShapeController.cxx 
b/chart2/source/controller/main/ShapeController.cxx
index 04683e058481..1c082d84505b 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -547,10 +547,10 @@ void ShapeController::executeDispatch_ParagraphDialog()
 aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
 aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
 
-ScopedVclPtrInstance< ShapeParagraphDialog > pDlg( pChartWindow, 
 );
-if ( pDlg->Execute() == RET_OK )
+ShapeParagraphDialog aDlg(pChartWindow->GetFrameWeld(), );
+if (aDlg.execute() == RET_OK)
 {
-const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
+const SfxItemSet* pOutAttr = aDlg.GetOutputItemSet();
 pDrawViewWrapper->SetAttributes( *pOutAttr );
 }
 }
diff --git a/chart2/uiconfig/ui/paradialog.ui b/chart2/uiconfig/ui/paradialog.ui
index f32fc5fa68d6..5e89c680dd44 100644
--- a/chart2/uiconfig/ui/paradialog.ui
+++ b/chart2/uiconfig/ui/paradialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,6 +7,9 @@
 6
 Paragraph
 dialog
+
+  
+
 
   
 False
@@ -17,12 +20,10 @@
 False
 end
 
-  
-gtk-ok
+  
+gtk-revert-to-saved
 True
 True
-True
-True
 True
 True
   
@@ -33,10 +34,12 @@
   
 
 
-  
-gtk-cancel
+  
+gtk-ok
 True
 True
+True
+True
 True
   

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/dlg_ShapeFont.cxx |   19 +--
 chart2/source/controller/inc/dlg_ShapeFont.hxx |8 -
 chart2/source/controller/main/ShapeController.cxx  |6 -
 chart2/uiconfig/ui/chardialog.ui   |  102 ++---
 4 files changed, 103 insertions(+), 32 deletions(-)

New commits:
commit 230f67d958be212ab496c66d3a7ed96ca498f241
Author: Caolán McNamara 
AuthorDate: Mon Sep 17 12:40:04 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 18 10:06:08 2018 +0200

weld ShapeFontDialog

Change-Id: I9df9dd3f2bfaedccb4a02681964544daf39f261e
Reviewed-on: https://gerrit.libreoffice.org/60580
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx 
b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index fbc2afdb94f0..7b257b556b44 100644
--- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -32,28 +32,25 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-ShapeFontDialog::ShapeFontDialog( vcl::Window* pParent, const SfxItemSet* 
pAttr,
-const ViewElementListProvider* pViewElementListProvider )
-: SfxTabDialog(pParent, "CharDialog",
-"modules/schart/ui/chardialog.ui", pAttr)
+ShapeFontDialog::ShapeFontDialog(weld::Window* pParent, const SfxItemSet* 
pAttr,
+const ViewElementListProvider* pViewElementListProvider)
+: SfxTabDialogController(pParent, "modules/schart/ui/chardialog.ui", 
"CharDialog", pAttr)
 , m_pViewElementListProvider(pViewElementListProvider)
-, m_nNamePageId(0)
-, m_nEffectsPageId(0)
 {
-m_nNamePageId = AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
-m_nEffectsPageId = AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS);
+AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
+AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS);
 AddTabPage("position", RID_SVXPAGE_CHAR_POSITION );
 }
 
-void ShapeFontDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
+void ShapeFontDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
 {
 SfxAllItemSet aSet( *( GetInputSetImpl()->GetPool() ) );
-if (nId == m_nNamePageId)
+if (rId == "font")
 {
 aSet.Put( SvxFontListItem( m_pViewElementListProvider->getFontList(), 
SID_ATTR_CHAR_FONTLIST ) );
 rPage.PageCreated( aSet );
 }
-else if (nId == m_nEffectsPageId)
+else if (rId == "fonteffects")
 {
 aSet.Put( SfxUInt16Item( SID_DISABLE_CTL, DISABLE_CASEMAP ) );
 rPage.PageCreated( aSet );
diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx 
b/chart2/source/controller/inc/dlg_ShapeFont.hxx
index 233015d560de..21abdcd17dea 100644
--- a/chart2/source/controller/inc/dlg_ShapeFont.hxx
+++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx
@@ -28,17 +28,15 @@ class ViewElementListProvider;
 
 /** dialog for font properties of shapes
  */
-class ShapeFontDialog : public SfxTabDialog
+class ShapeFontDialog : public SfxTabDialogController
 {
 public:
-ShapeFontDialog(vcl::Window* pParent, const SfxItemSet* pAttr,
+ShapeFontDialog(weld::Window* pParent, const SfxItemSet* pAttr,
 const ViewElementListProvider* pViewElementListProvider);
 private:
-virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override;
+virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
 
 const ViewElementListProvider* m_pViewElementListProvider;
-sal_uInt16 m_nNamePageId;
-sal_uInt16 m_nEffectsPageId;
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/main/ShapeController.cxx 
b/chart2/source/controller/main/ShapeController.cxx
index 32708238c1fc..04683e058481 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -512,10 +512,10 @@ void ShapeController::executeDispatch_FontDialog()
 SfxItemSet aAttr( pDrawViewWrapper->GetModel()->GetItemPool() );
 pDrawViewWrapper->GetAttributes( aAttr );
 ViewElementListProvider aViewElementListProvider( 
pDrawModelWrapper );
-ScopedVclPtrInstance< ShapeFontDialog > pDlg( pChartWindow, 
,  );
-if ( pDlg->Execute() == RET_OK )
+ShapeFontDialog aDlg(pChartWindow->GetFrameWeld(), , 
);
+if (aDlg.execute() == RET_OK)
 {
-const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
+const SfxItemSet* pOutAttr = aDlg.GetOutputItemSet();
 pDrawViewWrapper->SetAttributes( *pOutAttr );
 }
 }
diff --git a/chart2/uiconfig/ui/chardialog.ui b/chart2/uiconfig/ui/chardialog.ui
index 75f73e6db10e..fb7bfc1211b5 100644
--- a/chart2/uiconfig/ui/chardialog.ui
+++ b/chart2/uiconfig/ui/chardialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,6 +7,9 @@
 6
 Character
 dialog
+
+  
+
 
   
 False
@@ 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara]

 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx |   87 +--
 chart2/source/controller/inc/ChartController.hxx |1 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx |   25 +---
 chart2/source/controller/main/ChartController.cxx|9 +
 chart2/source/controller/main/ChartController_Insert.cxx |   12 +-
 chart2/uiconfig/ui/insertaxisdlg.ui  |8 +
 chart2/uiconfig/ui/insertgriddlg.ui  |8 +
 7 files changed, 74 insertions(+), 76 deletions(-)

New commits:
commit e4d95fa557179d787fd78211b76dd7c311940762
Author: Caolán McNamara 
Date:   Mon May 21 10:59:34 2018 +0100

weld SchAxisDlg

Change-Id: I18441b4fc06b69caf12dc73e5042ad2b609a7cc5
Reviewed-on: https://gerrit.libreoffice.org/54620
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx 
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 74f2ce9b8831..9a227f59b2f5 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -40,74 +40,55 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
 
 // SchAxisDlg
 
-SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,
+SchAxisDlg::SchAxisDlg(weld::Window* pWindow,
 const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
-: ModalDialog(pWindow,
-  bAxisDlg ?
-  OUString("InsertAxisDialog") :
-  OUString("InsertGridDialog"),
+: GenericDialogController(pWindow,
   bAxisDlg ?
   OUString("modules/schart/ui/insertaxisdlg.ui") :
-  OUString("modules/schart/ui/insertgriddlg.ui"))
+  OUString("modules/schart/ui/insertgriddlg.ui"),
+  bAxisDlg ?
+  OString("InsertAxisDialog") :
+  OString("InsertGridDialog"))
+, m_xCbPrimaryX(m_xBuilder->weld_check_button("primaryX"))
+, m_xCbPrimaryY(m_xBuilder->weld_check_button("primaryY"))
+, m_xCbPrimaryZ(m_xBuilder->weld_check_button("primaryZ"))
+, m_xCbSecondaryX(m_xBuilder->weld_check_button("secondaryX"))
+, m_xCbSecondaryY(m_xBuilder->weld_check_button("secondaryY"))
+, m_xCbSecondaryZ(m_xBuilder->weld_check_button("secondaryZ"))
 {
-get(m_pCbPrimaryX, "primaryX");
-get(m_pCbPrimaryY, "primaryY");
-get(m_pCbPrimaryZ, "primaryZ");
-get(m_pCbSecondaryX, "secondaryX");
-get(m_pCbSecondaryY, "secondaryY");
-get(m_pCbSecondaryZ, "secondaryZ");
-
 if (bAxisDlg)
 {
-
 //todo: remove if secondary z axis are possible somewhere
-m_pCbSecondaryZ->Hide();
+m_xCbSecondaryZ->hide();
 }
 
-m_pCbPrimaryX->Check( rInput.aExistenceList[0] );
-m_pCbPrimaryY->Check( rInput.aExistenceList[1] );
-m_pCbPrimaryZ->Check( rInput.aExistenceList[2] );
-m_pCbSecondaryX->Check( rInput.aExistenceList[3] );
-m_pCbSecondaryY->Check( rInput.aExistenceList[4] );
-m_pCbSecondaryZ->Check( rInput.aExistenceList[5] );
-
-m_pCbPrimaryX->Enable( rInput.aPossibilityList[0] );
-m_pCbPrimaryY->Enable( rInput.aPossibilityList[1] );
-m_pCbPrimaryZ->Enable( rInput.aPossibilityList[2] );
-m_pCbSecondaryX->Enable( rInput.aPossibilityList[3] );
-m_pCbSecondaryY->Enable( rInput.aPossibilityList[4] );
-m_pCbSecondaryZ->Enable( rInput.aPossibilityList[5] );
-}
-
-SchAxisDlg::~SchAxisDlg()
-{
-disposeOnce();
-}
-
-void SchAxisDlg::dispose()
-{
-m_pCbPrimaryX.clear();
-m_pCbPrimaryY.clear();
-m_pCbPrimaryZ.clear();
-m_pCbSecondaryX.clear();
-m_pCbSecondaryY.clear();
-m_pCbSecondaryZ.clear();
-ModalDialog::dispose();
+m_xCbPrimaryX->set_active( rInput.aExistenceList[0] );
+m_xCbPrimaryY->set_active( rInput.aExistenceList[1] );
+m_xCbPrimaryZ->set_active( rInput.aExistenceList[2] );
+m_xCbSecondaryX->set_active( rInput.aExistenceList[3] );
+m_xCbSecondaryY->set_active( rInput.aExistenceList[4] );
+m_xCbSecondaryZ->set_active( rInput.aExistenceList[5] );
+
+m_xCbPrimaryX->set_sensitive( rInput.aPossibilityList[0] );
+m_xCbPrimaryY->set_sensitive( rInput.aPossibilityList[1] );
+m_xCbPrimaryZ->set_sensitive( rInput.aPossibilityList[2] );
+m_xCbSecondaryX->set_sensitive( rInput.aPossibilityList[3] );
+m_xCbSecondaryY->set_sensitive( rInput.aPossibilityList[4] );
+m_xCbSecondaryZ->set_sensitive( rInput.aPossibilityList[5] );
 }
 
-
 void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput )
 {
-rOutput.aExistenceList[0]=m_pCbPrimaryX->IsChecked();
-rOutput.aExistenceList[1]=m_pCbPrimaryY->IsChecked();
-rOutput.aExistenceList[2]=m_pCbPrimaryZ->IsChecked();
-rOutput.aExistenceList[3]=m_pCbSecondaryX->IsChecked();
-rOutput.aExistenceList[4]=m_pCbSecondaryY->IsChecked();
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara]

 chart2/source/controller/dialogs/tp_ChartType.cxx |   87 ++
 chart2/uiconfig/ui/smoothlinesdlg.ui  |   29 ++-
 2 files changed, 49 insertions(+), 67 deletions(-)

New commits:
commit 8a5d6f832d675f0c02c0946e44a2ea7e6a7b1618
Author: Caolán McNamara 
Date:   Mon May 21 10:41:03 2018 +0100

weld SplinePropertiesDialog

Change-Id: I1df0f2bce86da698205c5b36217f935e0e971de5
Reviewed-on: https://gerrit.libreoffice.org/54619
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 7005fa80b8cb..ecd644fd8fc1 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -31,6 +31,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 namespace chart
@@ -301,50 +302,37 @@ IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl, 
CheckBox&, void )
 m_pChangeListener->stateChanged(this);
 }
 
-class SplinePropertiesDialog : public ModalDialog
+class SplinePropertiesDialog : public weld::GenericDialogController
 {
 public:
-explicit SplinePropertiesDialog( vcl::Window* pParent );
-virtual ~SplinePropertiesDialog() override { disposeOnce(); }
-virtual void dispose() override;
+explicit SplinePropertiesDialog(weld::Window* pParent);
 
 void fillControls( const ChartTypeParameter& rParameter );
 void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines );
 
 private:
-DECL_LINK( SplineTypeListBoxHdl, ListBox&, void );
+DECL_LINK(SplineTypeListBoxHdl, weld::ComboBoxText&, void);
 
 private:
-VclPtr  m_pLB_Spline_Type;
-
-VclPtr m_pMF_SplineResolution;
-VclPtrm_pFT_SplineOrder;
-VclPtr m_pMF_SplineOrder;
+std::unique_ptr m_xLB_Spline_Type;
+std::unique_ptr m_xMF_SplineResolution;
+std::unique_ptr m_xFT_SplineOrder;
+std::unique_ptr m_xMF_SplineOrder;
 };
 
 const sal_uInt16 CUBIC_SPLINE_POS = 0;
 const sal_uInt16 B_SPLINE_POS = 1;
 
-SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent )
-: ModalDialog( pParent, "SmoothLinesDialog", 
"modules/schart/ui/smoothlinesdlg.ui")
+SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui", 
"SmoothLinesDialog")
+, m_xLB_Spline_Type(m_xBuilder->weld_combo_box_text("SplineTypeComboBox"))
+, 
m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton"))
+, m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel"))
+, m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton"))
 {
-get(m_pLB_Spline_Type, "SplineTypeComboBox");
-get(m_pMF_SplineResolution, "ResolutionSpinbutton");
-get(m_pFT_SplineOrder, "PolynomialsLabel");
-get(m_pMF_SplineOrder, "PolynomialsSpinButton");
-
-SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) );
+m_xDialog->set_title(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
 
-m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, 
SplineTypeListBoxHdl ) );
-}
-
-void SplinePropertiesDialog::dispose()
-{
-m_pLB_Spline_Type.clear();
-m_pMF_SplineResolution.clear();
-m_pFT_SplineOrder.clear();
-m_pMF_SplineOrder.clear();
-ModalDialog::dispose();
+m_xLB_Spline_Type->connect_changed(LINK(this, SplinePropertiesDialog, 
SplineTypeListBoxHdl));
 }
 
 void SplinePropertiesDialog::fillControls( const ChartTypeParameter& 
rParameter )
@@ -352,38 +340,40 @@ void SplinePropertiesDialog::fillControls( const 
ChartTypeParameter& rParameter
 switch(rParameter.eCurveStyle)
 {
 case CurveStyle_CUBIC_SPLINES:
-m_pLB_Spline_Type->SelectEntryPos(CUBIC_SPLINE_POS);
+m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
 break;
 case CurveStyle_B_SPLINES:
-m_pLB_Spline_Type->SelectEntryPos(B_SPLINE_POS);
+m_xLB_Spline_Type->set_active(B_SPLINE_POS);
 break;
 default:
-m_pLB_Spline_Type->SelectEntryPos(CUBIC_SPLINE_POS);
+m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
 break;
 }
-m_pMF_SplineOrder->SetValue( rParameter.nSplineOrder );
-m_pMF_SplineResolution->SetValue( rParameter.nCurveResolution );
+m_xMF_SplineOrder->set_value( rParameter.nSplineOrder );
+m_xMF_SplineResolution->set_value( rParameter.nCurveResolution );
 
 //dis/enabling
-m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == 
B_SPLINE_POS);
-m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == 
B_SPLINE_POS);
+m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() == 
B_SPLINE_POS);
+m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() == 
B_SPLINE_POS);
 }
+
 void 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig icon-themes/elementary icon-themes/galaxy icon-themes/hicontrast icon-themes/oxygen icon-themes/tango icon-themes/tango_testing

[bansan85]

 chart2/source/controller/dialogs/DataBrowser.cxx   |   77 +
 chart2/source/controller/dialogs/DataBrowser.hxx   |   12 
 chart2/source/controller/dialogs/dlg_DataEditor.cxx|   30 
 chart2/source/controller/inc/dlg_DataEditor.hxx|6 
 chart2/uiconfig/ui/chartdatadialog.ui  |   36 
 icon-themes/elementary/chart2/res/dataeditor_icon08.png|binary
 icon-themes/elementary/chart2/res/dataeditor_icon09.png|binary
 icon-themes/galaxy/chart2/res/dataeditor_icon08.png|binary
 icon-themes/galaxy/chart2/res/dataeditor_icon09.png|binary
 icon-themes/hicontrast/chart2/res/dataeditor_icon08.png|binary
 icon-themes/hicontrast/chart2/res/dataeditor_icon09.png|binary
 icon-themes/oxygen/chart2/res/dataeditor_icon08.png|binary
 icon-themes/oxygen/chart2/res/dataeditor_icon09.png|binary
 icon-themes/tango/chart2/res/dataeditor_icon08.png |binary
 icon-themes/tango/chart2/res/dataeditor_icon09.png |binary
 icon-themes/tango_testing/chart2/res/dataeditor_icon08.png |binary
 icon-themes/tango_testing/chart2/res/dataeditor_icon08.svg |  769 +
 icon-themes/tango_testing/chart2/res/dataeditor_icon09.png |binary
 icon-themes/tango_testing/chart2/res/dataeditor_icon09.svg |  698 +++
 19 files changed, 1604 insertions(+), 24 deletions(-)

New commits:
commit a631e0fe94830fff5b81b4e852d37a666a9f3b9e
Author: bansan85 
Date:   Wed Dec 21 02:27:04 2016 +0100

Add move column right and move row up in DataTable

Change-Id: Ib224a99636dfbb4451aa26263573af2f3d31b84a
Reviewed-on: https://gerrit.libreoffice.org/32265
Tested-by: Jenkins 
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index acf2195..8c7af15 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -497,7 +497,15 @@ bool DataBrowser::MayDeleteColumn() const
 && ( ColCount() > 2 );
 }
 
-bool DataBrowser::MaySwapRows() const
+bool DataBrowser::MayMoveUpRows() const
+{
+return ! IsReadOnly()
+&& ( !lcl_SeriesHeaderHasFocus( m_aSeriesHeaders ))
+&& ( GetCurRow() > 0 )
+&& ( GetCurRow() <= GetRowCount() - 1 );
+}
+
+bool DataBrowser::MayMoveDownRows() const
 {
 return ! IsReadOnly()
 && ( !lcl_SeriesHeaderHasFocus( m_aSeriesHeaders ))
@@ -505,7 +513,24 @@ bool DataBrowser::MaySwapRows() const
 && ( GetCurRow() < GetRowCount() - 1 );
 }
 
-bool DataBrowser::MaySwapColumns() const
+bool DataBrowser::MayMoveLeftColumns() const
+{
+// if a series header (except the last one) has the focus
+{
+sal_Int32 nColIndex(0);
+if( lcl_SeriesHeaderHasFocus( m_aSeriesHeaders,  ))
+return (static_cast< sal_uInt32 >( nColIndex ) <= 
(m_aSeriesHeaders.size() - 1)) && (static_cast< sal_uInt32 >( nColIndex ) != 0);
+}
+
+sal_Int32 nColIdx = lcl_getColumnInDataOrHeader( GetCurColumnId(), 
m_aSeriesHeaders );
+return ! IsReadOnly()
+&& ( nColIdx > 1 )
+&& ( nColIdx <= ColCount() - 2 )
+&& m_apDataBrowserModel.get()
+&& !m_apDataBrowserModel->isCategoriesColumn( nColIdx );
+}
+
+bool DataBrowser::MayMoveRightColumns() const
 {
 // if a series header (except the last one) has the focus
 {
@@ -901,7 +926,29 @@ void DataBrowser::RemoveRow()
 }
 }
 
-void DataBrowser::SwapColumn()
+void DataBrowser::MoveLeftColumn()
+{
+sal_Int32 nColIdx = lcl_getColumnInDataOrHeader( GetCurColumnId(), 
m_aSeriesHeaders );
+
+if( nColIdx > 0 &&
+m_apDataBrowserModel.get())
+{
+// save changes made to edit-field
+if( IsModified() )
+SaveModified();
+
+m_apDataBrowserModel->swapDataSeries( nColIdx - 1 );
+
+// keep cursor in swapped column
+if(( 0 < GetCurColumnId() ) && ( GetCurColumnId() <= ColCount() - 1 ))
+{
+Dispatch( BROWSER_CURSORLEFT );
+}
+RenewTable();
+}
+}
+
+void DataBrowser::MoveRightColumn()
 {
 sal_Int32 nColIdx = lcl_getColumnInDataOrHeader( GetCurColumnId(), 
m_aSeriesHeaders );
 
@@ -923,7 +970,29 @@ void DataBrowser::SwapColumn()
 }
 }
 
-void DataBrowser::SwapRow()
+void DataBrowser::MoveUpRow()
+{
+ sal_Int32 nRowIdx = lcl_getRowInData( GetCurRow());
+
+ if( nRowIdx > 0 &&
+m_apDataBrowserModel.get())
+{
+// save changes made to edit-field
+if( IsModified() )
+SaveModified();
+
+m_apDataBrowserModel->swapDataPointForAllSeries( nRowIdx - 1 );
+
+// keep cursor in swapped row
+if(( 0 < GetCurRow() ) && ( GetCurRow() <= GetRowCount() - 1 ))
+{
+Dispatch( BROWSER_CURSORUP );
+}
+RenewTable();

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig extensions/source extras/source include/sfx2 include/svtools include/svx reportdesign/inc reportdesign/source sc/i

[Caolán McNamara]

 chart2/source/controller/dialogs/dlg_View3D.cxx  |4 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |   30 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx |   11 
 chart2/source/controller/inc/dlg_View3D.hxx  |3 
 chart2/source/controller/main/ChartController_Properties.cxx |2 
 chart2/source/controller/sidebar/ChartColorWrapper.cxx   |4 
 chart2/source/controller/sidebar/ChartColorWrapper.hxx   |3 
 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui|4 
 cui/source/inc/border.hxx|7 
 cui/source/inc/chardlg.hxx   |   11 
 cui/source/inc/cuires.hrc|1 
 cui/source/inc/cuitabarea.hxx|   24 
 cui/source/inc/cuitabline.hxx|5 
 cui/source/inc/numpages.hxx  |6 
 cui/source/options/optchart.cxx  |  107 ++
 cui/source/options/optchart.hxx  |   15 
 cui/source/options/optcolor.cxx  |   93 --
 cui/source/tabpages/backgrnd.cxx |2 
 cui/source/tabpages/border.cxx   |   58 -
 cui/source/tabpages/borderconn.cxx   |   13 
 cui/source/tabpages/borderconn.hxx   |4 
 cui/source/tabpages/chardlg.cxx  |  166 
 cui/source/tabpages/numpages.cxx |   32 
 cui/source/tabpages/strings.src  |4 
 cui/source/tabpages/tabarea.cxx  |1 
 cui/source/tabpages/tabline.cxx  |1 
 cui/source/tabpages/tpgradnt.cxx |   56 -
 cui/source/tabpages/tphatch.cxx  |   55 -
 cui/source/tabpages/tpline.cxx   |   30 
 cui/source/tabpages/tppattern.cxx|   58 -
 cui/source/tabpages/tpshadow.cxx |   36 
 cui/uiconfig/ui/borderpage.ui|4 
 cui/uiconfig/ui/colorconfigwin.ui|   92 +-
 cui/uiconfig/ui/effectspage.ui   |6 
 cui/uiconfig/ui/gradientpage.ui  |4 
 cui/uiconfig/ui/hatchpage.ui |4 
 cui/uiconfig/ui/linetabpage.ui   |2 
 cui/uiconfig/ui/numberingoptionspage.ui  |2 
 cui/uiconfig/ui/optchartcolorspage.ui|3 
 cui/uiconfig/ui/patterntabpage.ui|4 
 cui/uiconfig/ui/shadowtabpage.ui |2 
 extensions/source/propctrlr/commoncontrol.cxx|5 
 extensions/source/propctrlr/commoncontrol.hxx|   19 
 extensions/source/propctrlr/standardcontrol.cxx  |  109 --
 extensions/source/propctrlr/standardcontrol.hxx  |   24 
 extras/source/glade/libreoffice-catalog.xml.in   |   22 
 include/sfx2/controlwrapper.hxx  |   22 
 include/svtools/ctrlbox.hxx  |   82 --
 include/svtools/svtools.hrc  |2 
 include/svx/PaletteManager.hxx   |   11 
 include/svx/bmpmask.hxx  |   15 
 include/svx/colorbox.hxx |   94 ++
 include/svx/colorwindow.hxx  |   48 -
 include/svx/dialogs.hrc  |7 
 include/svx/dlgctrl.hxx  |   16 
 include/svx/float3d.hxx  |   34 
 include/svx/fontwork.hxx |9 
 include/svx/sidebar/AreaPropertyPanelBase.hxx|6 
 include/svx/svxids.hrc   |6 
 include/svx/tbcontrl.hxx |   16 
 reportdesign/inc/RptResId.hrc|4 
 reportdesign/inc/helpids.hrc |1 
 reportdesign/source/ui/dlg/CondFormat.src|   16 
 reportdesign/source/ui/dlg/Condition.cxx |  174 
 reportdesign/source/ui/dlg/Condition.hxx |   18 
 sc/inc/sc.hrc|2 
 sc/source/ui/condformat/colorformat.cxx  |   57 -
 sc/source/ui/condformat/condformatdlgentry.cxx   |   79 --
 sc/source/ui/dbgui/scendlg.cxx   |   22 
 sc/source/ui/drawfunc/drawsh4.cxx|   25 
 sc/source/ui/drawfunc/drtxtob2.cxx   |   25 
 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig extensions/source extras/source include/sfx2 include/svtools include/svx reportdesign/inc reportdesign/source sc/i

[Norbert Thiebaud]

 chart2/source/controller/dialogs/dlg_View3D.cxx  |4 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |   30 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx |   11 
 chart2/source/controller/inc/dlg_View3D.hxx  |3 
 chart2/source/controller/main/ChartController_Properties.cxx |2 
 chart2/source/controller/sidebar/ChartColorWrapper.cxx   |4 
 chart2/source/controller/sidebar/ChartColorWrapper.hxx   |3 
 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui|4 
 cui/source/inc/border.hxx|7 
 cui/source/inc/chardlg.hxx   |   11 
 cui/source/inc/cuires.hrc|1 
 cui/source/inc/cuitabarea.hxx|   24 
 cui/source/inc/cuitabline.hxx|5 
 cui/source/inc/numpages.hxx  |6 
 cui/source/options/optchart.cxx  |  107 --
 cui/source/options/optchart.hxx  |   15 
 cui/source/options/optcolor.cxx  |   93 +-
 cui/source/tabpages/backgrnd.cxx |2 
 cui/source/tabpages/border.cxx   |   58 +
 cui/source/tabpages/borderconn.cxx   |   13 
 cui/source/tabpages/borderconn.hxx   |4 
 cui/source/tabpages/chardlg.cxx  |  166 +++-
 cui/source/tabpages/numpages.cxx |   32 
 cui/source/tabpages/strings.src  |4 
 cui/source/tabpages/tabarea.cxx  |1 
 cui/source/tabpages/tabline.cxx  |1 
 cui/source/tabpages/tpgradnt.cxx |   56 +
 cui/source/tabpages/tphatch.cxx  |   55 +
 cui/source/tabpages/tpline.cxx   |   30 
 cui/source/tabpages/tppattern.cxx|   58 +
 cui/source/tabpages/tpshadow.cxx |   36 
 cui/uiconfig/ui/borderpage.ui|4 
 cui/uiconfig/ui/colorconfigwin.ui|   92 +-
 cui/uiconfig/ui/effectspage.ui   |6 
 cui/uiconfig/ui/gradientpage.ui  |4 
 cui/uiconfig/ui/hatchpage.ui |4 
 cui/uiconfig/ui/linetabpage.ui   |2 
 cui/uiconfig/ui/numberingoptionspage.ui  |2 
 cui/uiconfig/ui/optchartcolorspage.ui|3 
 cui/uiconfig/ui/patterntabpage.ui|4 
 cui/uiconfig/ui/shadowtabpage.ui |2 
 extensions/source/propctrlr/commoncontrol.cxx|5 
 extensions/source/propctrlr/commoncontrol.hxx|   19 
 extensions/source/propctrlr/standardcontrol.cxx  |  109 ++
 extensions/source/propctrlr/standardcontrol.hxx  |   24 
 extras/source/glade/libreoffice-catalog.xml.in   |   22 
 include/sfx2/controlwrapper.hxx  |   22 
 include/svtools/ctrlbox.hxx  |   82 ++
 include/svtools/svtools.hrc  |2 
 include/svx/PaletteManager.hxx   |   11 
 include/svx/bmpmask.hxx  |   15 
 include/svx/colorbox.hxx |   94 --
 include/svx/colorwindow.hxx  |   48 -
 include/svx/dialogs.hrc  |7 
 include/svx/dlgctrl.hxx  |   16 
 include/svx/float3d.hxx  |   34 
 include/svx/fontwork.hxx |9 
 include/svx/sidebar/AreaPropertyPanelBase.hxx|6 
 include/svx/svxids.hrc   |6 
 include/svx/tbcontrl.hxx |   16 
 reportdesign/inc/RptResId.hrc|4 
 reportdesign/inc/helpids.hrc |1 
 reportdesign/source/ui/dlg/CondFormat.src|   16 
 reportdesign/source/ui/dlg/Condition.cxx |  174 +++-
 reportdesign/source/ui/dlg/Condition.hxx |   18 
 sc/inc/sc.hrc|2 
 sc/source/ui/condformat/colorformat.cxx  |   57 +
 sc/source/ui/condformat/condformatdlgentry.cxx   |   79 +-
 sc/source/ui/dbgui/scendlg.cxx   |   22 
 sc/source/ui/drawfunc/drawsh4.cxx|   25 
 sc/source/ui/drawfunc/drtxtob2.cxx   |   25 
 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig include/sfx2 sc/source sc/uiconfig sfx2/source sfx2/uiconfig svx/source svx/uiconfig sw/source sw/uiconfig

[Muhammet Kara]

 chart2/source/controller/dialogs/Strings.src   |9 --
 chart2/source/controller/dialogs/tp_DataSource.cxx |3 
 chart2/source/inc/Strings.hrc  |7 -
 chart2/uiconfig/ui/tp_DataSource.ui|   46 ---
 include/sfx2/sfx.hrc   |2 
 sc/source/ui/dbgui/tpsort.cxx  |4 -
 sc/uiconfig/scalc/ui/sortoptionspage.ui|   50 
 sfx2/source/appl/sfx.src   |5 -
 sfx2/source/dialog/passwd.cxx  |2 
 sfx2/uiconfig/ui/password.ui   |   19 +++-
 svx/source/dialog/ctredlin.cxx |3 
 svx/uiconfig/ui/redlinefilterpage.ui   |   82 ++---
 sw/source/ui/chrdlg/break.cxx  |2 
 sw/uiconfig/swriter/ui/insertbreak.ui  |9 +-
 14 files changed, 84 insertions(+), 159 deletions(-)

New commits:
commit 67868423378130c0e88eed99a6921e81fe94352c
Author: Muhammet Kara 
Date:   Tue Jun 7 10:52:25 2016 +0300

Move accessibility relations to .ui files, Part 8: tdf#87026

By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.

Change-Id: I04244b360b4bb32ccbbe5bde4756a9166ae1fcaf
Reviewed-on: https://gerrit.libreoffice.org/26018
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/chart2/source/controller/dialogs/Strings.src 
b/chart2/source/controller/dialogs/Strings.src
index c9d18eb..6345574 100644
--- a/chart2/source/controller/dialogs/Strings.src
+++ b/chart2/source/controller/dialogs/Strings.src
@@ -94,15 +94,6 @@ String STR_PAGE_POSITION
 Text [ en-US ] = "Position" ;
 };
 
-String STR_BUTTON_UP
-{
-Text [ en-US ] = "Up";
-};
-String STR_BUTTON_DOWN
-{
-Text [ en-US ] = "Down";
-};
-
 String STR_PAGE_LAYOUT
 {
 Text [ en-US ] = "Layout";
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx 
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index c8808e1..9c8fe5f 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -267,9 +267,6 @@ DataSourceTabPage::DataSourceTabPage(
 if( m_pLB_SERIES->First())
 m_pLB_SERIES->Select( m_pLB_SERIES->First());
 m_pLB_SERIES->GrabFocus();
-
-m_pBTN_UP->SetAccessibleName(SCH_RESSTR(STR_BUTTON_UP));
-m_pBTN_DOWN->SetAccessibleName(SCH_RESSTR(STR_BUTTON_DOWN));
 }
 
 DataSourceTabPage::~DataSourceTabPage()
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 950050b..9ffe163 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -265,11 +265,8 @@
 #define STR_TEXT_DIRECTION_RTL  (RID_APP_START + 279)
 #define STR_TEXT_DIRECTION_SUPER(RID_APP_START + 280)
 
-#define STR_BUTTON_UP   (RID_APP_START + 500)
-#define STR_BUTTON_DOWN (RID_APP_START + 501)
-
-// ids must not exceed RID_APP_START + 499
-// ids >= RID_APP_START + 500 are defined in glob.hrc
+// There is a gap here due to removed strings
+// RID_APP_START + 500 and RID_APP_START + 501 are removed
 
 // CHART_STRINGS_HRC
 #endif
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui 
b/chart2/uiconfig/ui/tp_DataSource.ui
index 8de0320..55918aa 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -1,8 +1,8 @@
 
-
+
 
   
-  
+  
   
 True
 False
@@ -25,8 +25,8 @@
   
 True
 False
-0
 Customize Data Ranges for 
Individual Data Series
+0
 
   
 
@@ -55,10 +55,10 @@
   
 True
 False
-0
 Data 
_series:
 True
 LB_SERIES:border
+0
   
   
 False
@@ -102,8 +102,6 @@
   
 0
 0
-1
-1
   
 
 
@@ -113,12 +111,15 @@
 False
 True
 True
+
+  
+Up
+  
+
   
   
 1
 0
-1
-1
   
 
 
@@ -134,8 +135,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -144,12 +143,15 @@
 True
 False
 True
+
+  
+Down
+ 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig cui/source cui/uiconfig extensions/source extensions/uiconfig sc/source sc/uiconfig

[Muhammet Kara]

 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx |2 
 chart2/uiconfig/ui/tp_3D_SceneGeometry.ui|   37 ---
 cui/source/tabpages/paragrph.cxx |6 -
 cui/source/tabpages/paragrph.hrc |1 
 cui/source/tabpages/paragrph.src |4 -
 cui/uiconfig/ui/textflowpage.ui  |   26 +--
 extensions/source/dbpilots/groupboxwiz.cxx   |1 
 extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui |8 ++
 sc/source/ui/dbgui/scuiasciiopt.cxx  |3 
 sc/uiconfig/scalc/ui/textimportcsv.ui|   15 ++--
 10 files changed, 53 insertions(+), 50 deletions(-)

New commits:
commit 3498fd9fe905c2021fe1298769c8e2025c2d6f39
Author: Muhammet Kara 
Date:   Wed Jun 1 14:25:03 2016 +0300

Remove SetAccessibleRelationLabeledBy calls tdf#87026

And make proper changes in the related .ui files

Change-Id: Iea998b6de25831c08950a8afa725713288113bfa
Reviewed-on: https://gerrit.libreoffice.org/25807
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx 
b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 93f17f3..ae6bfa5 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -143,8 +143,6 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( 
vcl::Window* pWindow
 {
 m_pCbxRightAngledAxes->Enable(false);
 }
-m_pMFPerspective->SetAccessibleName(m_pCbxPerspective->GetText());
-m_pMFPerspective->SetAccessibleRelationLabeledBy(m_pCbxPerspective);
 }
 
 ThreeD_SceneGeometry_TabPage::~ThreeD_SceneGeometry_TabPage()
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui 
b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index d492804..f89fc13 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -1,6 +1,7 @@
 
+
 
-  
+  
   
 100
 1
@@ -32,55 +33,48 @@
 0
 0
 2
-1
   
 
 
   
 True
 False
-0
 _X rotation
 True
 MTR_FLD_X_ROTATION:0degrees
+0
   
   
 0
 1
-1
-1
   
 
 
   
 True
 False
-0
 _Y rotation
 True
 MTR_FLD_Y_ROTATION:0degrees
+0
   
   
 0
 2
-1
-1
   
 
 
   
 True
 False
-0
 _Z rotation
 True
 MTR_FLD_Z_ROTATION:0degrees
+0
   
   
 0
 3
-1
-1
   
 
 
@@ -92,12 +86,13 @@
 True
 0
 True
+
+  
+
   
   
 0
 4
-1
-1
   
 
 
@@ -106,12 +101,18 @@
 False
 •
 adjustmentPERSPECTIVE
+
+  
+
+
+  
+Perspective
+  
+
   
   
 1
 4
-1
-1
   
 
 
@@ -126,8 +127,6 @@
   
 1
 3
-1
-1
   
 
 
@@ -140,8 +139,6 @@
   
 1
 2
-1
-1
   
 
 
@@ -154,8 +151,6 @@
   
 1
 1
-1
-1
   
 
   
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4b9e7da..295a39a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1902,12 +1902,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( 
vcl::Window* pParent, const SfxI
 get(m_pWidowRowNo,"spinWidow");
 get(m_pWidowRowLabel,"labelWidow");
 
-m_pApplyCollBox->SetAccessibleRelationLabeledBy(m_pApplyCollBtn);
-m_pApplyCollBox->SetAccessibleName(CUI_RES(STR_PAGE_STYLE));
-
-m_pOrphanRowNo->SetAccessibleRelationLabeledBy(m_pOrphanBox);
-m_pWidowRowNo->SetAccessibleRelationLabeledBy(m_pWidowBox);
-
 // this page needs ExchangeSupport
 SetExchangeSupport();
 
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 31694ed..b59f213 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -22,7 +22,6 @@
 // StandardTabPage --
 
 #define STR_EXAMPLE 5010
-#define STR_PAGE_STYLE  5011
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index c246134..8c57940 100644
--- a/cui/source/tabpages/paragrph.src
+++ 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Katarina Behrens]

 chart2/source/controller/sidebar/ChartAxisPanel.cxx |6 +
 chart2/source/controller/sidebar/ChartAxisPanel.hxx |2 
 chart2/uiconfig/ui/sidebaraxis.ui   |  100 
 3 files changed, 72 insertions(+), 36 deletions(-)

New commits:
commit 00edc9567f5c5e45047edf46e0f994c285cfc4be
Author: Katarina Behrens katarina.behr...@cib.de
Date:   Wed Jul 29 15:55:54 2015 +0200

Some (mostly HIG) tweaks to chart axis panel

+ added a text orientation spinbox to .ui file, but it does nothing so
far

Change-Id: Idb9177683c46fba50a153aff795aab7a2f419694
Reviewed-on: https://gerrit.libreoffice.org/17402
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx 
b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index a9dcae7..fa6100e 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -197,6 +197,8 @@ ChartAxisPanel::ChartAxisPanel(
 get(mpCBReverse, checkbutton_reverse);
 
 get(mpLBLabelPos, comboboxtext_label_position);
+//FIXME: add text orientation spinbox + its handler
+get(mpGridLabel, label_props);
 
 Initialize();
 }
@@ -219,6 +221,7 @@ void ChartAxisPanel::dispose()
 mpCBReverse.clear();
 
 mpLBLabelPos.clear();
+mpGridLabel.clear();
 
 PanelLayout::dispose();
 }
@@ -322,7 +325,10 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, CheckBox*, 
pCheckbox)
 bool bChecked = pCheckbox-IsChecked();
 
 if (pCheckbox == mpCBShowLabel.get())
+{
+mpGridLabel-Enable(bChecked);
 setLabelShown(mxModel, aCID, bChecked);
+}
 else if (pCheckbox == mpCBReverse.get())
 setReverse(mxModel, aCID, bChecked);
 
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx 
b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index c21fa33..e6d878b 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -15,6 +15,7 @@
 #include sfx2/sidebar/IContextChangeReceiver.hxx
 #include sfx2/sidebar/SidebarModelUpdate.hxx
 #include svx/sidebar/PanelLayout.hxx
+#include vcl/layout.hxx
 
 #include ChartSidebarModifyListener.hxx
 #include ChartSidebarSelectionListener.hxx
@@ -79,6 +80,7 @@ private:
 VclPtrCheckBox mpCBReverse;
 
 VclPtrListBox mpLBLabelPos;
+VclPtrVclGrid mpGridLabel;
 
 css::uno::Referencecss::frame::XFrame mxFrame;
 
diff --git a/chart2/uiconfig/ui/sidebaraxis.ui 
b/chart2/uiconfig/ui/sidebaraxis.ui
index 8ceb0512..b758e31 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -5,13 +5,17 @@
   object class=GtkGrid id=ChartAxisPanel
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing6/property
 child
   object class=GtkGrid id=grid1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing6/property
 child
   object class=GtkCheckButton id=checkbutton_show_label
-property name=label translatable=yesShow Labels/property
+property name=label translatable=yesShow labels/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
@@ -38,10 +42,67 @@
   /packing
 /child
 child
-  object class=GtkLabel id=label1
+  object class=GtkGrid id=label_props
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=label translatable=yesLabel Position/property
+property name=margin_left12/property
+property name=row_spacing6/property
+property name=column_spacing5/property
+child
+  object class=GtkLabel id=label1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=halignend/property
+property name=label translatable=yes_Label 
position:/property
+property name=use_underlineTrue/property
+property 
name=mnemonic_widgetcomboboxtext_label_position/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach0/property
+  /packing
+/child
+child
+  object class=GtkComboBoxText id=comboboxtext_label_position
+property name=visibleTrue/property
+property name=can_focusFalse/property
+items
+  item translatable=yesNear 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Katarina Behrens]

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |7 
 chart2/source/controller/sidebar/ChartElementsPanel.hxx |2 
 chart2/uiconfig/ui/sidebarelements.ui   |  743 +---
 3 files changed, 455 insertions(+), 297 deletions(-)

New commits:
commit 93d301a287141013c28556570d67ffc9d3286b2a
Author: Katarina Behrens katarina.behr...@cib.de
Date:   Tue Jul 28 16:19:59 2015 +0200

Some (mostly HIG) tweaks to chart elements panel

As I wanted to represent subsections as frames (it looks kinda
better with bold labels), I tried to emulate grid behaviour by
putting widgets into 2 size groups

Other tweaks include disabling legend position listbox when legend
is not to be shown and missing clear() of that listbox

Change-Id: I0b635fe5aba1580542cf982e2e6be02eb0056352
Reviewed-on: https://gerrit.libreoffice.org/17386
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Katarina Behrens katarina.behr...@cib.de

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index fd498ff..08d1fea 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -310,6 +310,7 @@ ChartElementsPanel::ChartElementsPanel(
 get(mpCBGridHorizontalMinor,  checkbutton_gridline_horizontal_minor);
 
 get(mpLBLegendPosition, comboboxtext_legend);
+get(mpBoxLegend, box_legend);
 
 Initialize();
 }
@@ -342,6 +343,9 @@ void ChartElementsPanel::dispose()
 mpCBGridVerticalMinor.clear();
 mpCBGridHorizontalMinor.clear();
 
+mpLBLegendPosition.clear();
+mpBoxLegend.clear();
+
 PanelLayout::dispose();
 }
 
@@ -491,7 +495,10 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, 
pCheckBox)
 else if (pCheckBox == mpCB2ndYAxisTitle.get())
 setTitleVisible(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE, 
bChecked);
 else if (pCheckBox == mpCBLegend.get())
+{
+mpBoxLegend-Enable( bChecked );
 setLegendVisible(mxModel, bChecked);
+}
 else if (pCheckBox == mpCBGridVerticalMajor.get())
 setGridVisible(mxModel, GridType::VERT_MAJOR, bChecked);
 else if (pCheckBox == mpCBGridHorizontalMajor.get())
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 766915c..47265fb 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -23,6 +23,7 @@
 #include sfx2/sidebar/IContextChangeReceiver.hxx
 #include sfx2/sidebar/SidebarModelUpdate.hxx
 #include svx/sidebar/PanelLayout.hxx
+#include vcl/layout.hxx
 #include ChartSidebarModifyListener.hxx
 
 #include com/sun/star/util/XModifyListener.hpp
@@ -95,6 +96,7 @@ private:
 VclPtrCheckBox mpCBGridHorizontalMinor;
 
 VclPtrListBox mpLBLegendPosition;
+VclPtrVclHBox mpBoxLegend;
 
 css::uno::Referencecss::frame::XFrame mxFrame;
 ::sfx2::sidebar::EnumContextmaContext;
diff --git a/chart2/uiconfig/ui/sidebarelements.ui 
b/chart2/uiconfig/ui/sidebarelements.ui
index 94d1ff0..8250d6e 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -5,338 +5,487 @@
   object class=GtkGrid id=ChartElementsPanel
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 child
-  object class=GtkGrid id=container
+  object class=GtkBox id=container
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=resize_modeimmediate/property
-property name=row_homogeneousTrue/property
-property name=column_homogeneousTrue/property
+property name=orientationvertical/property
+property name=spacing6/property
 child
-  object class=GtkCheckButton id=checkbutton_subtitle
-property name=label translatable=yesSubtitle/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=xalign0/property
-property name=draw_indicatorTrue/property
-  /object
-  packing
-property name=left_attach1/property
-property name=top_attach1/property
-  /packing
-/child
-child
-  object class=GtkCheckButton id=checkbutton_x_axis
-property name=label translatable=yesX-Axis/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=xalign0/property
-property name=draw_indicatorTrue/property
-  /object
-  packing
-property 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Katarina Behrens]

 chart2/source/controller/sidebar/ChartSeriesPanel.cxx |   10 
 chart2/source/controller/sidebar/ChartSeriesPanel.hxx |3 
 chart2/uiconfig/ui/sidebarseries.ui   |  408 --
 3 files changed, 290 insertions(+), 131 deletions(-)

New commits:
commit 2d4223e32628d12b9b256b532819e6cced79178e
Author: Katarina Behrens katarina.behr...@cib.de
Date:   Tue Jul 28 17:34:20 2015 +0200

Some (mostly HIG) tweaks to chart data series panel

Additional tweak: use 'Data series %1' as frame label, substitute
%1 by real series name

Change-Id: Id5bee4c2e52ccd98fa40649ec539b3efdee55962
Reviewed-on: https://gerrit.libreoffice.org/17387
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Katarina Behrens katarina.behr...@cib.de

diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 644766d..85336ff 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -302,9 +302,11 @@ ChartSeriesPanel::ChartSeriesPanel(
 get(mpRBPrimaryAxis, radiobutton_primary_axis);
 get(mpRBSecondaryAxis, radiobutton_secondary_axis);
 
+get(mpBoxLabelPlacement, datalabel_box);
 get(mpLBLabelPlacement, comboboxtext_label);
 
 get(mpFTSeriesName, label_series_name);
+get(mpFTSeriesTemplate, label_series_tmpl);
 
 Initialize();
 }
@@ -330,9 +332,11 @@ void ChartSeriesPanel::dispose()
 mpRBPrimaryAxis.clear();
 mpRBSecondaryAxis.clear();
 
+mpBoxLabelPlacement.clear();
 mpLBLabelPlacement.clear();
 
 mpFTSeriesName.clear();
+mpFTSeriesTemplate.clear();
 
 PanelLayout::dispose();
 }
@@ -374,10 +378,12 @@ void ChartSeriesPanel::updateData()
 mpRBPrimaryAxis-Check(bPrimaryAxis);
 mpRBSecondaryAxis-Check(!bPrimaryAxis);
 
-mpLBLabelPlacement-Enable(bLabelVisible);
+mpBoxLabelPlacement-Enable(bLabelVisible);
 mpLBLabelPlacement-SelectEntryPos(getDataLabelPlacement(mxModel, aCID));
 
-mpFTSeriesName-SetText(getSeriesLabel(mxModel, aCID));
+OUString aFrameLabel = mpFTSeriesTemplate-GetText();
+aFrameLabel = aFrameLabel.replaceFirst(%1, getSeriesLabel(mxModel, 
aCID));
+mpFTSeriesName-SetText(aFrameLabel);
 }
 
 VclPtrvcl::Window ChartSeriesPanel::Create (
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index 156bbc7..d125c2f 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -23,6 +23,7 @@
 #include sfx2/sidebar/IContextChangeReceiver.hxx
 #include sfx2/sidebar/SidebarModelUpdate.hxx
 #include svx/sidebar/PanelLayout.hxx
+#include vcl/layout.hxx
 
 #include ChartSidebarModifyListener.hxx
 #include ChartSidebarSelectionListener.hxx
@@ -91,9 +92,11 @@ private:
 VclPtrRadioButton mpRBPrimaryAxis;
 VclPtrRadioButton mpRBSecondaryAxis;
 
+VclPtrVclHBox mpBoxLabelPlacement;
 VclPtrListBox mpLBLabelPlacement;
 
 VclPtrFixedText mpFTSeriesName;
+VclPtrFixedText mpFTSeriesTemplate;
 
 css::uno::Referencecss::frame::XFrame mxFrame;
 
diff --git a/chart2/uiconfig/ui/sidebarseries.ui 
b/chart2/uiconfig/ui/sidebarseries.ui
index 88180b5..bdaca87 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -5,147 +5,297 @@
   object class=GtkGrid id=ChartSeriesPanel
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=border_width6/property
 child
-  object class=GtkGrid id=grid2
+  object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing6/property
 child
-  object class=GtkLabel id=label_series_name
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=label translatable=yeslabel/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach0/property
-  /packing
-/child
-child
-  object class=GtkCheckButton id=checkbutton_label
-property name=label translatable=yesShow data 
label/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=xalign0/property
-property name=draw_indicatorTrue/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach1/property
-  /packing
-/child
-child
-  object class=GtkCheckButton id=checkbutton_trendline
-property name=label translatable=yesTrendline/property
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Katarina Behrens]

 chart2/source/controller/dialogs/dlg_ChartType.cxx |2 -
 chart2/source/controller/dialogs/tp_ChartType.cxx  |7 +++--
 chart2/source/controller/dialogs/tp_ChartType.hxx  |2 -
 chart2/uiconfig/ui/tp_ChartType.ui |   27 ++---
 4 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 66178fc9dd8427a3bce55feb5ccb7e54c288f8ae
Author: Katarina Behrens bu...@bubli.org
Date:   Tue Jul 22 22:57:03 2014 +0200

fdo#81547, part2: show only relevant widgets in layout tabpage

Set initial status of most of the widgets in .ui file to hidden,
*ResourceGroup::showControls() method will take care of showing
them when appropriate

Change-Id: I19d8df661ea7ee122e06ab854a9eb0a5edf62320

diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx 
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 49620c7..4acb338 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -47,7 +47,7 @@ ChartTypeDialog::ChartTypeDialog( Window* pParent
 uno::ReferenceXChartDocument::query(m_xChartModel),
 m_xCC,
 true/*live update*/,
-true/*hide title description*/);
+false/*don't show title description*/);
 
 m_pChartTypeTabPage-initializePage();
 m_pChartTypeTabPage-Show();
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 0e313b6..00defcf 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -678,7 +678,7 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl)
 ChartTypeTabPage::ChartTypeTabPage(Window* pParent
 , const uno::Reference XChartDocument  xChartModel
 , const uno::Reference uno::XComponentContext  xContext
-, bool bDoLiveUpdate, bool bHideDescription)
+, bool bDoLiveUpdate, bool bShowDescription)
 : OWizardPage(pParent, tp_ChartType,
 modules/schart/ui/tp_ChartType.ui)
 , m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(this) )
@@ -702,9 +702,9 @@ ChartTypeTabPage::ChartTypeTabPage(Window* pParent
 m_pSubTypeList-set_width_request(aSize.Width());
 m_pSubTypeList-set_height_request(aSize.Height());
 
-if( bHideDescription )
+if( bShowDescription )
 {
-m_pFT_ChooseType-Hide();
+m_pFT_ChooseType-Show();
 }
 else
 {
@@ -914,6 +914,7 @@ void ChartTypeTabPage::selectMainType()
 
 void ChartTypeTabPage::showAllControls( ChartTypeDialogController 
rTypeController )
 {
+m_pMainTypeList-Show();
 m_pSubTypeList-Show();
 
 bool bShow = rTypeController.shouldShow_3DLookControl();
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx 
b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 4d3229a..81557a4 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -53,7 +53,7 @@ public:
 ::com::sun::star::chart2::XChartDocument  xChartModel
 , const ::com::sun::star::uno::Reference
 ::com::sun::star::uno::XComponentContext  xContext
-, bool bDoLiveUpdate, bool bHideDescription = false );
+, bool bDoLiveUpdate, bool bShowDescription = true );
 virtual ~ChartTypeTabPage();
 
 virtual voidinitializePage() SAL_OVERRIDE;
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui 
b/chart2/uiconfig/ui/tp_ChartType.ui
index 8c61c43..242cd62 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -47,7 +47,7 @@
 property name=spacing6/property
 child
   object class=GtkLabel id=FT_CAPTION_FOR_WIZARD
-property name=visibleTrue/property
+property name=visibleFalse/property
 property name=can_focusFalse/property
 property name=xalign0/property
 property name=label translatable=yesChoose a Chart 
Type/property
@@ -76,7 +76,7 @@
 property name=row_spacing6/property
 child
   object class=svtlo-ValueSet id=subtype:border
-property name=visibleTrue/property
+property name=visibleFalse/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
   /object
@@ -100,7 +100,7 @@
 child
   object class=GtkCheckButton id=3dlook
 property name=label translatable=yes_3D 
Look/property
-property name=visibleTrue/property
+property name=visibleFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Markus Mohrhard]

 chart2/source/controller/dialogs/dlg_PropertyMapping.cxx |   34 
 chart2/source/controller/dialogs/dlg_PropertyMapping.hxx |   35 
 chart2/uiconfig/ui/dlg_PropertyMapping.ui|  119 +++
 3 files changed, 188 insertions(+)

New commits:
commit 042fec5bf2d00e55a0ef8b2a0120e821189b5088
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Sun Feb 9 14:19:14 2014 +0100

forgot the new files

Change-Id: I63bdb340aa06b072541bb8b0ed975457c504c9a2

diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx 
b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
new file mode 100644
index 000..c41859f
--- /dev/null
+++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.cxx
@@ -0,0 +1,34 @@
+/* -*- 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/.
+ */
+
+#include dlg_PropertyMapping.hxx
+
+namespace chart {
+
+namespace {
+
+static long pListBoxTabs[] =
+{
+3,
+0, 0, 75
+};
+
+}
+
+PropertyMappingDlg::PropertyMappingDlg(Window* pParent):
+ModalDialog(pParent, Property Mapping Dialog, 
modules/schart/ui/dlg_PropertyMapping.ui)
+{
+get(mpMappingTable, LST_PROPERTY_MAPPING);
+
+mpMappingTable-SetTabs( pListBoxTabs, MAP_APPFONT );
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx 
b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
new file mode 100644
index 000..3240a30
--- /dev/null
+++ b/chart2/source/controller/dialogs/dlg_PropertyMapping.hxx
@@ -0,0 +1,35 @@
+/* -*- 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/.
+ */
+
+#ifndef CHART2_PROPERTY_MAPPING_HXX
+#define CHART2_PROPERTY_MAPPING_HXX
+
+#include vcl/dialog.hxx
+#include svtools/svtabbx.hxx
+
+namespace chart {
+
+class PropertyMappingDlg : public ModalDialog
+{
+public:
+
+PropertyMappingDlg(Window* pParent);
+
+OUString getSelectedEntry();
+
+private:
+
+SvTabListBox* mpMappingTable;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/dlg_PropertyMapping.ui 
b/chart2/uiconfig/ui/dlg_PropertyMapping.ui
new file mode 100644
index 000..55ae428
--- /dev/null
+++ b/chart2/uiconfig/ui/dlg_PropertyMapping.ui
@@ -0,0 +1,119 @@
+?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
+interface
+  requires lib=gtk+ version=3.10/
+  !-- interface-requires LibreOffice 1.0 --
+  object class=GtkWindow id=window1
+property name=can_focusFalse/property
+property name=type_hintdialog/property
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+child
+  object class=GtkLabel id=LB_TITLE
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesSelect property 
mapping:/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=svtlo-SvTabListBox id=LST_PROPERTY_MAPPING
+property name=width_request110/property
+property name=height_request110/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+child internal-child=selection
+  object class=GtkTreeSelection id=Tab List-selection2/
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButtonBox id=buttonbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=margin_top6/property
+property name=margin_bottom6/property
+property name=spacing6/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=label translatable=yesOk/property
+property name=visibleTrue/property
+property 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Laurent Balland-Poirier]

 chart2/source/controller/dialogs/res_Trendline.cxx |   53 +
 chart2/source/controller/dialogs/res_Trendline.hxx |4 -
 chart2/uiconfig/ui/tp_Trendline.ui |9 ---
 3 files changed, 27 insertions(+), 39 deletions(-)

New commits:
commit 3c5dd9812b1028188b186f070874bdb6ecdcd4ba
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Fri Dec 13 07:25:20 2013 +0100

fdo#40316 Remove SpinButton in UI for extrapolate trendline

UI Trendline: Spinbutton are not adapted for real value of x-values used
in extrapolate For/Back-ward. Replaced with FormattedFiled
like Intercept value

Change-Id: Idc49f842a0f76906eb3c027e15a493e625c3d535
Reviewed-on: https://gerrit.libreoffice.org/7067
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com

diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index c8bba7e..91552e4 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -54,8 +54,8 @@ TrendlineResources::TrendlineResources( Window * pParent, 
const SfxItemSet rInA
 pTabPage-get(m_pNF_Degree,degree);
 pTabPage-get(m_pNF_Period,period);
 pTabPage-get(m_pEE_Name,entry_name);
-pTabPage-get(m_pNF_ExtrapolateForward,extrapolateForward);
-pTabPage-get(m_pNF_ExtrapolateBackward,extrapolateBackward);
+pTabPage-get(m_pFmtFld_ExtrapolateForward,extrapolateForward);
+pTabPage-get(m_pFmtFld_ExtrapolateBackward,extrapolateBackward);
 pTabPage-get(m_pCB_SetIntercept,setIntercept);
 pTabPage-get(m_pFmtFld_InterceptValue,interceptValue);
 pTabPage-get(m_pCB_ShowEquation,showEquation);
@@ -81,11 +81,6 @@ TrendlineResources::TrendlineResources( Window * pParent, 
const SfxItemSet rInA
 m_pNF_Period-SetModifyHdl( aLink );
 m_pFmtFld_InterceptValue-SetModifyHdl( aLink );
 
-m_pNF_ExtrapolateForward-SetMin( SAL_MIN_INT64 );
-m_pNF_ExtrapolateForward-SetMax( SAL_MAX_INT64 );
-m_pNF_ExtrapolateBackward-SetMin( SAL_MIN_INT64 );
-m_pNF_ExtrapolateBackward-SetMax( SAL_MAX_INT64 );
-
 Reset( rInAttrs );
 UpdateControlStates();
 }
@@ -159,27 +154,21 @@ void TrendlineResources::Reset( const SfxItemSet 
rInAttrs )
 m_pNF_Period-SetValue( 2 );
 }
 
+double nValue = 0.0;
 if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, 
sal_True, pPoolItem ) == SFX_ITEM_SET )
 {
-double nValue = static_cast const SvxDoubleItem * ( pPoolItem 
)-GetValue() * 100;
-m_pNF_ExtrapolateForward-SetValue( (sal_Int64) nValue );
-}
-else
-{
-m_pNF_ExtrapolateForward-SetValue( 0 );
+nValue = ((const SvxDoubleItem*)pPoolItem)-GetValue() ;
 }
+lcl_setValue( *m_pFmtFld_ExtrapolateForward, nValue );
 
+nValue = 0.0;
 if( rInAttrs.GetItemState( SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, 
sal_True, pPoolItem ) == SFX_ITEM_SET )
 {
-double nValue = static_cast const SvxDoubleItem * ( pPoolItem 
)-GetValue() * 100;
-m_pNF_ExtrapolateBackward-SetValue( (sal_Int64) nValue );
-}
-else
-{
-m_pNF_ExtrapolateBackward-SetValue( 0 );
+nValue = ((const SvxDoubleItem*)pPoolItem)-GetValue() ;
 }
+lcl_setValue( *m_pFmtFld_ExtrapolateBackward, nValue );
 
-double nValue = 0.0;;
+nValue = 0.0;
 if( rInAttrs.GetItemState( SCHATTR_REGRESSION_INTERCEPT_VALUE, sal_True, 
pPoolItem ) == SFX_ITEM_SET )
 {
 nValue = ((const SvxDoubleItem*)pPoolItem)-GetValue() ;
@@ -273,19 +262,21 @@ sal_Bool TrendlineResources::FillItemSet(SfxItemSet 
rOutAttrs) const
 sal_Int32 aPeriod = m_pNF_Period-GetValue();
 rOutAttrs.Put(SfxInt32Item( SCHATTR_REGRESSION_PERIOD, aPeriod ) );
 
-double aExtrapolateForwardValue = m_pNF_ExtrapolateForward-GetValue() / 
100.0;
-rOutAttrs.Put(SvxDoubleItem( aExtrapolateForwardValue, 
SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD ) );
+sal_uInt32 nIndex = 0;
+double aValue = 0.0;
+
m_pNumFormatter-IsNumberFormat(m_pFmtFld_ExtrapolateForward-GetText(),nIndex,aValue);
+rOutAttrs.Put(SvxDoubleItem( aValue, 
SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD ) );
 
-double aExtrapolateBackwardValue = m_pNF_ExtrapolateBackward-GetValue() / 
100.0;
-rOutAttrs.Put(SvxDoubleItem( aExtrapolateBackwardValue, 
SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD ) );
+aValue = 0.0;
+
m_pNumFormatter-IsNumberFormat(m_pFmtFld_ExtrapolateBackward-GetText(),nIndex,aValue);
+rOutAttrs.Put(SvxDoubleItem( aValue, 
SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD ) );
 
 if( m_pCB_SetIntercept-GetState() != STATE_DONTKNOW )
 rOutAttrs.Put( SfxBoolItem( SCHATTR_REGRESSION_SET_INTERCEPT, 
m_pCB_SetIntercept-IsChecked() ));
 
-double aInterceptValue = 0.0;
-sal_uInt32 nIndex = 0;
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Laurent Balland-Poirier]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |9 ++
 chart2/source/controller/dialogs/res_Trendline.cxx|   43 --
 chart2/source/controller/dialogs/res_Trendline.hxx|   13 +++-
 chart2/source/controller/dialogs/tp_Trendline.cxx |5 +
 chart2/source/controller/dialogs/tp_Trendline.hxx |1 
 chart2/uiconfig/ui/tp_Trendline.ui|   38 +---
 6 files changed, 68 insertions(+), 41 deletions(-)

New commits:
commit 1ef7640148d35646f465d0d7026529b588cb4bcf
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Mon Dec 2 09:54:21 2013 +0100

fdo#40314 Free value of intercept for trend line

Intercept value field has been changed to FormattedField
to support scientific notation and more than 4 digits
after decimal point

Change-Id: Idb2d27862ddabcdc96a036d93f1f3498cc6327df
Reviewed-on: https://gerrit.libreoffice.org/6904
Reviewed-by: Tomaž Vajngerl qui...@gmail.com
Tested-by: Tomaž Vajngerl qui...@gmail.com

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx 
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 05b5544..6e1974b 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -634,6 +634,15 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, 
SfxTabPage rPage)
 m_pParameter-ProvidesBarConnectors() );
 break;
 }
+case TP_TRENDLINE:
+{
+TrendlineTabPage* pTrendlineTabPage = dynamic_cast 
TrendlineTabPage* ( rPage );
+if(pTrendlineTabPage)
+{
+pTrendlineTabPage-SetNumFormatter( m_pNumberFormatter );
+}
+break;
+}
 }
 }
 
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 76be297..e1b6a07 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -33,9 +33,16 @@
 namespace chart
 {
 
+void lcl_setValue( FormattedField rFmtField, double fValue )
+{
+rFmtField.SetValue( fValue );
+rFmtField.SetDefaultValue( fValue );
+}
+
 TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet 
rInAttrs ) :
 m_eTrendLineType( CHREGRESS_LINEAR ),
-m_bTrendLineUnique( true )
+m_bTrendLineUnique( true ),
+m_pNumFormatter(NULL)
 {
 SfxTabPage* pTabPage = reinterpret_castSfxTabPage*(pParent);
 pTabPage-get(m_pRB_Linear,linear);
@@ -50,7 +57,7 @@ TrendlineResources::TrendlineResources( Window * pParent, 
const SfxItemSet rInA
 pTabPage-get(m_pNF_ExtrapolateForward,extrapolateForward);
 pTabPage-get(m_pNF_ExtrapolateBackward,extrapolateBackward);
 pTabPage-get(m_pCB_SetIntercept,setIntercept);
-pTabPage-get(m_pNF_InterceptValue,interceptValue);
+pTabPage-get(m_pFmtFld_InterceptValue,interceptValue);
 pTabPage-get(m_pCB_ShowEquation,showEquation);
 pTabPage-get(m_pCB_ShowCorrelationCoeff,showCorrelationCoefficient);
 pTabPage-get(m_pFI_Linear,imageLinear);
@@ -69,17 +76,15 @@ TrendlineResources::TrendlineResources( Window * pParent, 
const SfxItemSet rInA
 m_pRB_Polynomial-SetClickHdl( aLink );
 m_pRB_MovingAverage-SetClickHdl( aLink );
 
-aLink = LINK(this, TrendlineResources, ChangeNumericField );
+aLink = LINK(this, TrendlineResources, ChangeValue );
 m_pNF_Degree-SetModifyHdl( aLink );
 m_pNF_Period-SetModifyHdl( aLink );
-m_pNF_InterceptValue-SetModifyHdl( aLink );
+m_pFmtFld_InterceptValue-SetModifyHdl( aLink );
 
 m_pNF_ExtrapolateForward-SetMin( SAL_MIN_INT64 );
 m_pNF_ExtrapolateForward-SetMax( SAL_MAX_INT64 );
 m_pNF_ExtrapolateBackward-SetMin( SAL_MIN_INT64 );
 m_pNF_ExtrapolateBackward-SetMax( SAL_MAX_INT64 );
-m_pNF_InterceptValue-SetMin( SAL_MIN_INT64 );
-m_pNF_InterceptValue-SetMax( SAL_MAX_INT64 );
 
 Reset( rInAttrs );
 UpdateControlStates();
@@ -174,15 +179,12 @@ void TrendlineResources::Reset( const SfxItemSet 
rInAttrs )
 m_pNF_ExtrapolateBackward-SetValue( 0 );
 }
 
+double nValue = 0.0;;
 if( rInAttrs.GetItemState( SCHATTR_REGRESSION_INTERCEPT_VALUE, sal_True, 
pPoolItem ) == SFX_ITEM_SET )
 {
-double nValue = static_cast const SvxDoubleItem * ( pPoolItem 
)-GetValue() * 1;
-m_pNF_InterceptValue-SetValue( (sal_Int64) nValue );
-}
-else
-{
-m_pNF_InterceptValue-SetValue( 0 );
+nValue = ((const SvxDoubleItem*)pPoolItem)-GetValue() ;
 }
+lcl_setValue( *m_pFmtFld_InterceptValue, nValue );
 
 aState = rInAttrs.GetItemState( SCHATTR_REGRESSION_SET_INTERCEPT, 
sal_True, pPoolItem );
 if( aState == SFX_ITEM_DONTCARE )
@@ -280,7 +282,9 @@ sal_Bool TrendlineResources::FillItemSet(SfxItemSet 
rOutAttrs) const
 if( 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara]

 chart2/source/controller/dialogs/dlg_InsertLegend.cxx   |2 
 chart2/source/controller/dialogs/res_LegendPosition.cxx |  247 
+-
 chart2/source/controller/dialogs/res_LegendPosition.hxx |   52 +-
 chart2/source/controller/dialogs/tp_LegendPosition.cxx  |   13 
 chart2/source/controller/dialogs/tp_LegendPosition.hxx  |   10 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx |2 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |4 
 chart2/source/controller/inc/dlg_InsertLegend.hxx   |4 
 chart2/uiconfig/ui/tp_LegendPosition.ui |   78 ++-
 9 files changed, 363 insertions(+), 49 deletions(-)

New commits:
commit 07a58db41301d15523519b99d2c64f1885909cda
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Nov 27 10:31:37 2013 +

provide two LegendPositionResources for the interim

LegendPositionResources for .ui based stuff and a legacy
oldLegendPositionResources which can be phased out when
the last .res based user is gone

Change-Id: I02478882e0cb54ee0fe5c2c5d15382f94758a3d2

diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx 
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index e291771..c8513d2 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 
 SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference 
uno::XComponentContext xCC )
 : ModalDialog(pWindow, SchResId(DLG_LEGEND))
-, m_apLegendPositionResources( new LegendPositionResources(this,xCC) )
+, m_apLegendPositionResources( new oldLegendPositionResources(this,xCC) )
 , aBtnOK(this, SchResId(BTN_OK))
 , aBtnCancel(this, SchResId(BTN_CANCEL))
 , aBtnHelp(this, SchResId(BTN_HELP))
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx 
b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3f0b459..fe7d3df 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -42,7 +42,219 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-LegendPositionResources::LegendPositionResources( Window* pWindow )
+LegendPositionResources::LegendPositionResources(VclBuilderContainer rParent)
+: m_xCC() //unused in this scenario
+, m_pCbxShow( NULL ) //unused in this scenario, assumed to be visible
+{
+rParent.get(m_pRbtLeft, left);
+rParent.get(m_pRbtRight, right);
+rParent.get(m_pRbtTop, top);
+rParent.get(m_pRbtBottom, bottom);
+impl_setRadioButtonToggleHdl();
+}
+
+LegendPositionResources::LegendPositionResources(VclBuilderContainer rParent,
+const uno::Reference uno::XComponentContext  xCC)
+: m_xCC(xCC)
+{
+rParent.get(m_pCbxShow, show);
+rParent.get(m_pRbtLeft, left);
+rParent.get(m_pRbtRight, right);
+rParent.get(m_pRbtTop, top);
+rParent.get(m_pRbtBottom, bottom);
+
+m_pCbxShow-SetToggleHdl( LINK( this, LegendPositionResources, 
PositionEnableHdl ) );
+impl_setRadioButtonToggleHdl();
+}
+
+void LegendPositionResources::impl_setRadioButtonToggleHdl()
+{
+m_pRbtLeft-SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_pRbtTop-SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_pRbtRight-SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+m_pRbtBottom-SetToggleHdl( LINK( this, LegendPositionResources, 
PositionChangeHdl ) );
+}
+
+LegendPositionResources::~LegendPositionResources()
+{
+}
+
+void LegendPositionResources::writeToResources( const uno::Reference 
frame::XModel  xChartModel )
+{
+try
+{
+uno::Reference XDiagram  xDiagram = ChartModelHelper::findDiagram( 
xChartModel );
+uno::Reference beans::XPropertySet  xProp( xDiagram-getLegend(), 
uno::UNO_QUERY );
+if( xProp.is() )
+{
+//show
+sal_Bool bShowLegend = sal_False;
+xProp-getPropertyValue( Show ) = bShowLegend;
+if (m_pCbxShow)
+m_pCbxShow-Check( bShowLegend );
+PositionEnableHdl(0);
+
+//position
+chart2::LegendPosition ePos;
+xProp-getPropertyValue( AnchorPosition )  = ePos;
+switch( ePos )
+{
+case chart2::LegendPosition_LINE_START:
+m_pRbtLeft-Check();
+break;
+case chart2::LegendPosition_LINE_END:
+m_pRbtRight-Check();
+break;
+case chart2::LegendPosition_PAGE_START:
+m_pRbtTop-Check();
+break;
+case chart2::LegendPosition_PAGE_END:
+m_pRbtBottom-Check();
+break;
+
+

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk

[Manal Alhassoun]

 chart2/UIConfig_chart2.mk |1 
 chart2/source/controller/dialogs/tp_AxisLabel.cxx |  184 -
 chart2/source/controller/dialogs/tp_AxisLabel.hxx |   43 +-
 chart2/source/controller/dialogs/tp_AxisLabel.src |  187 -
 chart2/uiconfig/ui/tp_axisLabel.ui|  425 ++
 5 files changed, 536 insertions(+), 304 deletions(-)

New commits:
commit 07aade88b05c3388b3344b8c244b0815b61ac141
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Wed Sep 4 10:52:43 2013 +0300

tp_axisLabel.ui widgets

Change-Id: I279d2989e6a3a8f0aa279c5aa8eb13251a6052da
Reviewed-on: https://gerrit.libreoffice.org/5801
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index ea08c58..999547c 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
chart2/uiconfig/ui/steppedlinesdlg \
chart2/uiconfig/ui/titlerotationtabpage \
+   chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_SeriesToAxis \
 ))
 
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx 
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 606052f..59ad0b5 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -36,30 +36,7 @@ namespace chart
 {
 
 SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet 
rInAttrs ) :
-SfxTabPage( pParent, SchResId( TP_AXIS_LABEL ), rInAttrs ),
-
-aCbShowDescription( this, SchResId( CB_AXIS_LABEL_SCHOW_DESCR ) ),
-
-aFlOrder( this, SchResId( FL_AXIS_LABEL_ORDER ) ),
-aRbSideBySide( this, SchResId( RB_AXIS_LABEL_SIDEBYSIDE ) ),
-aRbUpDown( this, SchResId( RB_AXIS_LABEL_UPDOWN ) ),
-aRbDownUp( this, SchResId( RB_AXIS_LABEL_DOWNUP ) ),
-aRbAuto( this, SchResId( RB_AXIS_LABEL_AUTOORDER ) ),
-
-aFlSeparator( this, SchResId( FL_SEPARATOR ) ),
-aFlTextFlow( this, SchResId( FL_AXIS_LABEL_TEXTFLOW ) ),
-aCbTextOverlap( this, SchResId( CB_AXIS_LABEL_TEXTOVERLAP ) ),
-aCbTextBreak( this, SchResId( CB_AXIS_LABEL_TEXTBREAK ) ),
-
-aFlOrient( this, SchResId( FL_AXIS_LABEL_ORIENTATION ) ),
-aCtrlDial( this, SchResId( CT_AXIS_LABEL_DIAL ) ),
-aFtRotate( this, SchResId( FT_AXIS_LABEL_DEGREES ) ),
-aNfRotate( this, SchResId( NF_AXIS_LABEL_ORIENT ) ),
-aCbStacked( this, SchResId( PB_AXIS_LABEL_TEXTSTACKED ) ),
-aOrientHlp( aCtrlDial, aNfRotate, aCbStacked ),
-
-m_aFtTextDirection( this, SchResId( FT_AXIS_TEXTDIR ) ),
-m_aLbTextDirection( this, SchResId( LB_AXIS_TEXTDIR ), 
m_aFtTextDirection ),
+SfxTabPage( pParent, 
AxisLabelTabPage,modules/schart/ui/tp_axisLabel.ui, rInAttrs ),
 
 m_bShowStaggeringControls( true ),
 
@@ -69,22 +46,39 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, 
const SfxItemSet rIn
 m_bHasInitialStacking( true ),
 m_bComplexCategories( false )
 {
-FreeResource();
-
-aCbStacked.EnableTriState( sal_False );
-aOrientHlp.AddDependentWindow( aFlOrient );
-aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK );
-
-aCbShowDescription.SetClickHdl( LINK( this, SchAxisLabelTabPage, 
ToggleShowLabel ) );
-
-//  Make the fixed line separator vertical.
-aFlSeparator.SetStyle (aFlSeparator.GetStyle() | WB_VERT);
+get(m_pCbShowDescription, showlabelsCB);
+get(m_pFlOrder, orderL);
+get(m_pRbSideBySide, tile);
+get(m_pRbUpDown, odd);
+get(m_pRbDownUp, even);
+get(m_pRbAuto, auto);
+get(m_pFlTextFlow, textflowL);
+get(m_pCbTextOverlap, overlapCB);
+get(m_pCbTextBreak, breakCB);
+get(m_pFlOrient, labelTextOrient);
+get(m_pCtrlDial,dialCtrl);
+get(m_pFtRotate,degreeL);
+get(m_pNfRotate,OrientDegree);
+get(m_pCbStacked,stackedCB);
+get(m_pFtTextDirection,textdirL);
+get(m_pLbTextDirection,textdirLB);
+get(m_pFtABCD,labelABCD);
+m_pCtrlDial-SetText(m_pFtABCD-GetText());
+m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, 
*m_pCbStacked);
+m_pOrientHlp-Enable( sal_True );
+
+
+m_pCbStacked-EnableTriState( sal_False );
+m_pOrientHlp-AddDependentWindow( *m_pFlOrient );
+m_pOrientHlp-AddDependentWindow( *m_pFtRotate, STATE_CHECK );
+
+m_pCbShowDescription-SetClickHdl( LINK( this, SchAxisLabelTabPage, 
ToggleShowLabel ) );
 
 Construct();
 }
 
 SchAxisLabelTabPage::~SchAxisLabelTabPage()
-{}
+{delete m_pOrientHlp;}
 
 void SchAxisLabelTabPage::Construct()
 {
@@ -98,16 +92,16 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, 
const SfxItemSet rAtt
 sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet rOutAttrs )
 {
 bool bStacked = false;
-

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara]

 chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx |   40 ---
 chart2/source/controller/inc/HelpIds.hrc |2 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx |2 
 chart2/uiconfig/ui/insertaxisdlg.ui  |   22 ++--
 chart2/uiconfig/ui/insertgriddlg.ui  |   22 ++--
 5 files changed, 26 insertions(+), 62 deletions(-)

New commits:
commit 1c7e0ba6cd9b1ce6a3e1c65460a3a0849bcb3189
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 11 10:49:11 2013 +0100

post .ui conversion we can remove explicit SetPosPixel and HelpIds

Change-Id: I2b7ff3e667ce1085676168e19a9c4ce7c404ac0b

diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx 
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index a31f514..9b59ed4 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -50,16 +50,15 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
 //
 //==
 
-SchAxisDlg::SchAxisDlg( Window* pWindow
-   , const InsertAxisOrGridDialogData rInput, sal_Bool 
bAxisDlg )
-: ModalDialog(pWindow,
-  bAxisDlg ?
-  OString(InsertAxisDialog) :
-  OString(InsertGridDialog),
-  bAxisDlg ?
-  OUString(modules/schart/ui/insertaxisdlg.ui) :
-  OUString(modules/schart/ui/insertgriddlg.ui))
-//rOutAttrs( rInAttrs )
+SchAxisDlg::SchAxisDlg(Window* pWindow,
+const InsertAxisOrGridDialogData rInput, bool bAxisDlg)
+: ModalDialog(pWindow,
+  bAxisDlg ?
+  OString(InsertAxisDialog) :
+  OString(InsertGridDialog),
+  bAxisDlg ?
+  OUString(modules/schart/ui/insertaxisdlg.ui) :
+  OUString(modules/schart/ui/insertgriddlg.ui))
 {
 get(m_pCbPrimaryX, primaryX);
 get(m_pCbPrimaryY, primaryY);
@@ -68,28 +67,11 @@ SchAxisDlg::SchAxisDlg( Window* pWindow
 get(m_pCbSecondaryY, secondaryY);
 get(m_pCbSecondaryZ, secondaryZ);
 
-if(!bAxisDlg)
-{
-SetHelpId( HID_INSERT_GRIDS );
-
-m_pCbPrimaryX-SetHelpId( HID_SCH_CB_XGRID );
-m_pCbPrimaryY-SetHelpId( HID_SCH_CB_YGRID );
-m_pCbPrimaryZ-SetHelpId( HID_SCH_CB_ZGRID );
-m_pCbSecondaryX-SetHelpId( HID_SCH_CB_SECONDARY_XGRID );
-m_pCbSecondaryY-SetHelpId( HID_SCH_CB_SECONDARY_YGRID );
-m_pCbSecondaryZ-SetHelpId( HID_SCH_CB_SECONDARY_ZGRID );
-}
-else
+if (bAxisDlg)
 {
 
 //todo: remove if secondary z axis are possible somewhere
-{
-m_pCbSecondaryZ-Hide();
-
-Size aSize( GetSizePixel() );
-aSize.Height() -= ( m_pCbSecondaryZ-GetPosPixel().Y() - 
m_pCbSecondaryY-GetPosPixel().Y() );
-SetSizePixel(aSize);
-}
+m_pCbSecondaryZ-Hide();
 }
 
 m_pCbPrimaryX-Check( rInput.aExistenceList[0] );
diff --git a/chart2/source/controller/inc/HelpIds.hrc 
b/chart2/source/controller/inc/HelpIds.hrc
index 26ee1c8..32d5f6a 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -139,8 +139,6 @@
 #define HID_SCH_STATISTIK_SHOW_POSITIVE 
CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE
 #define HID_SCH_STATISTIK_SHOW_NEGATIVE 
CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE
 
-#define HID_INSERT_GRIDS
CHART2_HID_INSERT_GRIDS
-
 #define HID_DIAGRAM_TYPE
CHART2_HID_DIAGRAM_TYPE
 #define HID_3D_VIEW 
CHART2_HID_3D_VIEW
 #define HID_DIAGRAM_DATA
CHART2_HID_DIAGRAM_DATA
diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx 
b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
index 37c9589..868a657 100644
--- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
+++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx
@@ -56,7 +56,7 @@ protected:
 CheckBox* m_pCbSecondaryZ;
 
 public:
-SchAxisDlg( Window* pParent, const InsertAxisOrGridDialogData rInput, 
sal_Bool bAxisDlg=true );
+SchAxisDlg(Window* pParent, const InsertAxisOrGridDialogData rInput, bool 
bAxisDlg=true);
 virtual ~SchAxisDlg();
 
 void getResult( InsertAxisOrGridDialogData rOutput );
diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui 
b/chart2/uiconfig/ui/insertaxisdlg.ui
index 9c686f4..3062d09 100644
--- a/chart2/uiconfig/ui/insertaxisdlg.ui
+++ b/chart2/uiconfig/ui/insertaxisdlg.ui
@@ -3,18 +3,18 @@
   !-- interface-requires gtk+ 3.0 --
   object class=GtkDialog id=InsertAxisDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
 property name=title translatable=yesAxes/property
 property name=type_hintdialog/property
 child 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk icon-themes/galaxy

[Eric Seynaeve]

 chart2/UIConfig_chart2.mk   |1 
 chart2/source/controller/dialogs/Bitmaps.hrc|   17 
 chart2/source/controller/dialogs/Bitmaps.src|   57 ++
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx  |  125 +++--
 chart2/source/controller/dialogs/Strings.src|5 
 chart2/source/controller/dialogs/Strings_AdditionalControls.src |   15 
 chart2/source/controller/dialogs/tp_ChartType.cxx   |  211 
-
 chart2/source/controller/dialogs/tp_ChartType.hrc   |2 
 chart2/source/controller/dialogs/tp_ChartType.src   |   19 
 chart2/source/inc/Strings.hrc   |5 
 chart2/uiconfig/ui/steppedlinesdlg.ui   |  227 
++
 icon-themes/galaxy/chart2/res/nostackstepped3d_52x60.png|binary
 icon-themes/galaxy/chart2/res/nostacksteppedboth_52x60.png  |binary
 icon-themes/galaxy/chart2/res/nostacksteppedlines_52x60.png |binary
 icon-themes/galaxy/chart2/res/nostacksteppedpoints_52x60.png|binary
 icon-themes/galaxy/chart2/res/stackstepped3d_52x60.png  |binary
 icon-themes/galaxy/chart2/res/stacksteppedboth_52x60.png|binary
 icon-themes/galaxy/chart2/res/stacksteppedlines_52x60.png   |binary
 icon-themes/galaxy/chart2/res/stacksteppedpoints_52x60.png  |binary
 icon-themes/galaxy/chart2/res/step_center_x_30.png  |binary
 icon-themes/galaxy/chart2/res/step_center_y_30.png  |binary
 icon-themes/galaxy/chart2/res/step_end_30.png   |binary
 icon-themes/galaxy/chart2/res/step_start_30.png |binary
 icon-themes/galaxy/chart2/res/valueaxisstepped3d_52x60.png  |binary
 icon-themes/galaxy/chart2/res/valueaxissteppedboth_52x60.png|binary
 icon-themes/galaxy/chart2/res/valueaxissteppedlines_52x60.png   |binary
 26 files changed, 609 insertions(+), 75 deletions(-)

New commits:
commit edc3bfd558f3065a5444ad3f5c456da9546d16c4
Author: Eric Seynaeve git...@nosperse.com
Date:   Wed Apr 10 00:15:43 2013 +0200

Adding the dialog for setting stepped lines.

The UI changes still need some more tweaking:
- adjusting the vertical alignment in the splineresourcegroup
- put the images in the radio buttons instead of in front of them

Change-Id: I4bc5ebe5167eca9a5b1341d9328a7d74b62cf819

diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index da90c19..48d1561 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
+   chart2/uiconfig/ui/steppedlinesdlg \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc 
b/chart2/source/controller/dialogs/Bitmaps.hrc
index e1f5710..ced4537 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -39,6 +39,10 @@
 #define IMG_TYPE_NET(RID_APP_START + 8)
 #define IMG_TYPE_STOCK  (RID_APP_START + 9)
 #define IMG_TYPE_COLUMN_LINE  (RID_APP_START + 10)
+#define IMG_STEP_START  (RID_APP_START + 11)
+#define IMG_STEP_END(RID_APP_START + 12)
+#define IMG_STEP_CENTER_X (RID_APP_START + 13)
+#define IMG_STEP_CENTER_Y (RID_APP_START + 14)
 
 //-
 //Chart Subtypes
@@ -115,6 +119,7 @@
 #define BMP_POINTS_XVALUES (RID_APP_START + 47)
 #define BMP_POINTS_XCATEGORY (RID_APP_START + 48)
 #define BMP_POINTS_STACKED (RID_APP_START + 49)
+#define BMP_POINTS_STACKED (RID_APP_START + 49)
 
 
 #define BMP_LINE_P_XVALUES (RID_APP_START + 50)
@@ -141,6 +146,18 @@
 #define BMP_LINE_O_STACKED_SMOOTH (RID_APP_START + 66)
 #define BMP_LINE3D_STACKED_SMOOTH (RID_APP_START + 67)
 
+#define BMP_LINE_P_XVALUES_STEPPED (RID_APP_START + 97)
+#define BMP_LINE_O_XVALUES_STEPPED (RID_APP_START + 98)
+#define BMP_LINE3D_XVALUES_STEPPED (RID_APP_START + 99)
+
+#define BMP_LINE_P_XCATEGORY_STEPPED (RID_APP_START + 100)
+#define BMP_LINE_O_XCATEGORY_STEPPED (RID_APP_START + 101)
+#define BMP_LINE3D_XCATEGORY_STEPPED (RID_APP_START + 102)
+
+#define BMP_LINE_P_STACKED_STEPPED (RID_APP_START + 103)
+#define BMP_LINE_O_STACKED_STEPPED (RID_APP_START + 104)
+#define BMP_LINE3D_STACKED_STEPPED (RID_APP_START + 105)
+
 //--
 // Area Chart Subtypes
 
diff --git a/chart2/source/controller/dialogs/Bitmaps.src 
b/chart2/source/controller/dialogs/Bitmaps.src
index b4b3360..e566ec4 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -68,6 +68,26 @@ Image IMG_TYPE_BUBBLE
 ImageBitmap = Bitmap { File = typebubble_16.png ; };
 MaskColor = STD_MASKCOLOR;
 };
+Image IMG_STEP_START
+{
+ImageBitmap = Bitmap { File = step_start_30.png ; };
+MaskColor = 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[EricSeynaeve]

 chart2/source/controller/dialogs/tp_ChartType.cxx |   84 -
 chart2/source/controller/dialogs/tp_ChartType.hrc |   11 --
 chart2/source/controller/dialogs/tp_ChartType.src |   87 --
 chart2/uiconfig/ui/smoothlinesdlg.ui  |   77 +++
 4 files changed, 64 insertions(+), 195 deletions(-)

New commits:
commit cd5f0475372ffea2770e48aead82eaee2136a8d6
Author: EricSeynaeve git...@nosperse.com
Date:   Thu Mar 28 07:10:54 2013 +0100

Converting Smooth Lines dialog to glade

Change-Id: I098267a4b11322df84f4a10e83f3c47a69418371
Reviewed-on: https://gerrit.libreoffice.org/3103
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 3907494..449c45e 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -438,14 +438,16 @@ public:
 virtual void StateChanged( StateChangedType nType );
 
 private:
-DECL_LINK( SplineModeRadioHdl, void* );
+DECL_LINK( SplineTypeListBoxHdl, void* );
 
 void adjustControlPositions();
 void adjustSize();
 
+const sal_uInt16 CUBIC_SPLINE_POS = 0;
+const sal_uInt16 B_SPLINE_POS = 1;
+
 private:
-RadioButton* m_pRB_Splines_Cubic;
-RadioButton* m_pRB_Splines_B;
+ListBox* m_pLB_Spline_Type;
 
 NumericField* m_pMF_SplineResolution;
 FixedText*m_pFT_SplineOrder;
@@ -455,16 +457,14 @@ private:
 SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent )
 : ModalDialog( pParent, SmoothLinesDialog, 
modules/chart2/ui/smoothlinesdlg.ui)
 {
-get(m_pRB_Splines_Cubic, CubicSplineRadioButton);
-get(m_pRB_Splines_B, BSplineRadioButton);
+get(m_pLB_Spline_Type, SplineTypeComboBox);
 get(m_pMF_SplineResolution, ResolutionSpinbutton);
 get(m_pFT_SplineOrder, PolynomialsLabel);
 get(m_pMF_SplineOrder, PolynomialsSpinButton);
 
 this-SetText( String( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) ) );
 
-m_pRB_Splines_Cubic-SetToggleHdl( LINK( this, SplinePropertiesDialog, 
SplineModeRadioHdl ) );
-m_pRB_Splines_B-SetToggleHdl( LINK( this, SplinePropertiesDialog, 
SplineModeRadioHdl ) );
+m_pLB_Spline_Type-SetSelectHdl( LINK (this, SplinePropertiesDialog, 
SplineTypeListBoxHdl ) );
 }
 
 SplinePropertiesDialog::~SplinePropertiesDialog()
@@ -474,95 +474,45 @@ SplinePropertiesDialog::~SplinePropertiesDialog()
 void SplinePropertiesDialog::StateChanged( StateChangedType nType )
 {
 Dialog::StateChanged( nType );
-
-if( nType == STATE_CHANGE_INITSHOW )
-{
-adjustControlPositions();
-adjustSize();
-}
 }
 
-void SplinePropertiesDialog::adjustControlPositions()
-{
-/////position of controls:
-/////
-/////fixed line and Fixed texts as near as possible to radio controls
-///long nRBWidth = ::std::max( 
m_pRB_Splines_Cubic-CalcMinimumSize().Width(), 
m_pRB_Splines_B-CalcMinimumSize().Width());
-///long nFLXPos = 
m_pRB_Splines_Cubic-GetPosPixel().X()+nRBWidth+m_pFT_SplineOrder-LogicToPixel(
 Size(RSC_SP_CTRL_GROUP_X,0), MapMode(MAP_APPFONT) ).Width();
-///long nFTXPos = nFLXPos + m_pFL_SplineSeparator-GetSizePixel().Width() 
+ m_pFT_SplineOrder-LogicToPixel( Size(RSC_SP_CTRL_GROUP_X,0), 
MapMode(MAP_APPFONT) ).Width();
-///
-///m_pRB_Splines_Cubic-SetSizePixel( Size( nRBWidth, 
m_pRB_Splines_Cubic-GetSizePixel().Height() ) );
-///m_pRB_Splines_B-SetSizePixel( Size( nRBWidth, 
m_pRB_Splines_B-GetSizePixel().Height() ) );
-///
-///m_pFL_SplineSeparator-SetPosPixel( Point( nFLXPos, 
m_pFL_SplineSeparator-GetPosPixel().Y() ) );
-///
-///m_pFT_SplineOrder-SetPosPixel( Point( nFTXPos, 
m_pFT_SplineOrder-GetPosPixel().Y() ) );
-///m_aFT_SplineResolution.SetPosPixel( Point( nFTXPos, 
m_aFT_SplineResolution.GetPosPixel().Y() ) );
-///
-/////
-/////move metric controls as near to text as possible
-///long nFTWidth = ::std::max( 
m_pFT_SplineOrder-CalcMinimumSize().Width(), 
m_aFT_SplineResolution.CalcMinimumSize().Width());
-///long nMFXPos = 
m_pFT_SplineOrder-GetPosPixel().X()+nFTWidth+m_pFT_SplineOrder-LogicToPixel( 
Size(RSC_SP_CTRL_DESC_X,0), MapMode(MAP_APPFONT) ).Width();
-///
-///m_pFT_SplineOrder-SetSizePixel( Size( nFTWidth, 
m_pFT_SplineOrder-GetSizePixel().Height() ) );
-///m_aFT_SplineResolution.SetSizePixel( Size( nFTWidth, 
m_aFT_SplineResolution.GetSizePixel().Height() ) );
-///
-///m_pMF_SplineOrder-SetPosPixel( Point( nMFXPos, 
m_pMF_SplineOrder-GetPosPixel().Y() ) );
-///m_pMF_SplineResolution-SetPosPixel( Point( nMFXPos, 
m_pMF_SplineResolution-GetPosPixel().Y() ) );
-}
-
-void SplinePropertiesDialog::adjustSize()
-{
-///Size aDlgSize( this-GetSizePixel() );
-///long nBorder = m_pRB_Splines_Cubic-GetPosPixel().X();
-///long nX = 

[Libreoffice-commits] core.git: chart2/source chart2/uiconfig

[Caolán McNamara]

 chart2/source/controller/inc/HelpIds.hrc |1 
 chart2/uiconfig/ui/smoothlinesdlg.ui |  141 ---
 2 files changed, 73 insertions(+), 69 deletions(-)

New commits:
commit 55f878d7ea532c51c66cc0388ce5b09d42827a26
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Apr 2 09:46:34 2013 +0100

various efforts to consistently apply HIG rules

Change-Id: I70c5cd5c8bd1104c717ee6d8ed6b5f43a079596a

diff --git a/chart2/source/controller/inc/HelpIds.hrc 
b/chart2/source/controller/inc/HelpIds.hrc
index 72396a0..d48189c 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -53,7 +53,6 @@
 
 #define HID_SCH_CHART_AUTO_FORMAT   
CHART2_HID_SCH_CHART_AUTO_FORMAT
 #define HID_SCH_LB_BAR_GEOMETRY 
CHART2_HID_SCH_LB_BAR_GEOMETRY
-#define HID_SCH_DLG_SPLINE_PROPERTIES   
CHART2_HID_SCH_DLG_SPLINE_PROPERTIES
 #define HID_SCH_DLG_RANGES  
CHART2_HID_SCH_DLG_RANGES
 
 #define HID_SCH_CB_XAXIS
CHART2_HID_SCH_CB_XAXIS
diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui 
b/chart2/uiconfig/ui/smoothlinesdlg.ui
index d6ca523..65464d7 100644
--- a/chart2/uiconfig/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
@@ -17,7 +17,7 @@
   /object
   object class=GtkDialog id=SmoothLinesDialog
 property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
 property name=title translatable=yesSmooth Lines/property
 property name=modalTrue/property
 property name=type_hintdialog/property
@@ -25,7 +25,7 @@
   object class=GtkBox id=dialog-vbox1
 property name=can_focusFalse/property
 property name=orientationvertical/property
-property name=spacing2/property
+property name=spacing12/property
 child
   object class=GtkBox id=box1
 property name=visibleTrue/property
@@ -35,11 +35,11 @@
   object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=spacing12/property
 child
   object class=GtkLabel id=TypeLabel
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_right12/property
 property name=label translatable=yesLine 
_Type:/property
 property name=use_underlineTrue/property
   /object
@@ -73,76 +73,82 @@
   /packing
 /child
 child
-  object class=GtkGrid id=grid2
+  object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
 child
-  object class=GtkLabel id=ResolutionLabel
+  object class=GtkGrid id=grid2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=halignstart/property
-property name=margin_left6/property
-property name=margin_right12/property
-property name=label 
translatable=yes_Resolution:/property
-property name=use_underlineTrue/property
-property 
name=mnemonic_widgetResolutionSpinbutton/property
-  /object
-  packing
-property name=left_attach0/property
-property name=top_attach0/property
-property name=width1/property
-property name=height1/property
-  /packing
-/child
-child
-  object class=GtkLabel id=PolynomialsLabel
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=halignstart/property
-property name=margin_left6/property
-property name=margin_right12/property
-property name=label translatable=yes_Degree of 
polynomials:/property
-property name=use_underlineTrue/property
-property 
name=mnemonic_widgetPolynomialsSpinButton/property
+property name=row_spacing6/property
+property name=column_spacing12/property
+child
+  object class=GtkLabel id=ResolutionLabel
+property name=visibleTrue/property
+property name=can_focusFalse/property
+