[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util
solenv/bin/native-code.py |1 +
xmloff/inc/facreg.hxx |5 -
xmloff/source/core/facreg.cxx |1 -
xmloff/source/draw/sdxmlexp.cxx | 13 -
xmloff/util/xo.component|3 ++-
5 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit bd824be5371d5e4d6e49b72ccf01897ba301c55e
Author: Miklos Vajna
AuthorDate: Thu Feb 7 21:40:54 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 8 09:32:50 2019 +0100
xmloff: create XMLImpressExportOasis instances with an uno constructor
Change-Id: I58c689f5a1b034f64687031e24b82a3ac56e4bae
Reviewed-on: https://gerrit.libreoffice.org/67519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 3b531cbfc126..ad9924686565 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -253,6 +253,7 @@ core_constructor_list = [
# xmloff/util/xo.component
"XMLVersionListPersistence_get_implementation",
"com_sun_star_comp_Impress_XMLOasisImporter_get_implementation",
+"com_sun_star_comp_Impress_XMLOasisExporter_get_implementation",
# xmlscript/util/xmlscript.component
"com_sun_star_comp_xmlscript_XMLBasicExporter",
"com_sun_star_comp_xmlscript_XMLBasicImporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index aa30d961c4d1..c48af506ca8a 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -56,11 +56,6 @@ css::uno::Reference
XMLImpressSettingsImportOasis_createIn
css::uno::Reference const & rSMgr);
// impress oasis export
-OUString XMLImpressExportOasis_getImplementationName() throw();
-css::uno::Sequence XMLImpressExportOasis_getSupportedServiceNames()
throw();
-/// @throws css::uno::Exception
-css::uno::Reference XMLImpressExportOasis_createInstance(
-css::uno::Reference const & rSMgr);
OUString XMLImpressStylesExportOasis_getImplementationName() throw();
css::uno::Sequence
XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 9d9bd88e59f3..329967efd696 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -63,7 +63,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const
sal_Char * pImplName, voi
else SINGLEFACTORY( XMLImpressSettingsImportOasis )
// impress oasis export
-else SINGLEFACTORY( XMLImpressExportOasis )
else SINGLEFACTORY( XMLImpressStylesExportOasis )
else SINGLEFACTORY( XMLImpressContentExportOasis )
else SINGLEFACTORY( XMLImpressMetaExportOasis )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 58324bb90383..529aabcb4a3e 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2650,7 +2650,18 @@ uno::Reference< uno::XInterface >
classname##_createInstance(const uno::Referenc
return static_cast(new SdXMLExport(
comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
-SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter",
"XMLImpressExportOasis", false,
SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED
);
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisExporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new SdXMLExport(
+pCtx, "XMLImpressExportOasis", false,
+SvXMLExportFlags::OASIS | SvXMLExportFlags::META |
SvXMLExportFlags::STYLES
+| SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::AUTOSTYLES
+| SvXMLExportFlags::CONTENT | SvXMLExportFlags::SCRIPTS |
SvXMLExportFlags::SETTINGS
+| SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::EMBEDDED));
+}
+
SERVICE( XMLImpressStylesExportOasis,
"com.sun.star.comp.Impress.XMLOasisStylesExporter",
"XMLImpressStylesExportOasis", false,
SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS
);
SERVICE( XMLImpressContentExportOasis,
"com.sun.star.comp.Impress.XMLOasisContentExporter",
"XMLImpressContentExportOasis", false,
SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS
);
SERVICE( XMLImpressMetaExportOasis,
"com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis",
false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 75d33db263c7..fe88914cdc88 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@
[Libreoffice-commits] core.git: basctl/source basegfx/source basic/source bridges/source include/basegfx
basctl/source/basicide/moduldlg.cxx | 12 +-
basctl/source/dlged/dlged.cxx| 18 +--
basctl/source/dlged/dlgedobj.cxx | 12 +-
basegfx/source/inc/hommatrixtemplate.hxx |2
basegfx/source/polygon/b2dtrapezoid.cxx |2
basic/source/basmgr/basmgr.cxx |2
basic/source/classes/image.cxx |2
basic/source/classes/sbunoobj.cxx|2
basic/source/classes/sbxmod.cxx |6 -
basic/source/comp/buffer.cxx |2
basic/source/comp/dim.cxx|2
basic/source/comp/parser.cxx |2
basic/source/sbx/sbxint.cxx | 11 --
basic/source/sbx/sbxvalue.cxx| 100 +--
basic/source/uno/namecont.cxx|2
basic/source/uno/scriptcont.cxx |2
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |8 -
include/basegfx/utils/rectcliptools.hxx | 18 +--
18 files changed, 102 insertions(+), 103 deletions(-)
New commits:
commit 587ac01f97d3fd63638bbb1e4b165b49140bfc90
Author: Noel Grandin
AuthorDate: Fri Feb 8 09:27:38 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 10:01:05 2019 +0100
loplugin:indentation in basctl..bridges
Change-Id: Ie4e27466c4258c6f774a3ebb82ec3a88c28fd753
Reviewed-on: https://gerrit.libreoffice.org/67525
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index d1455ff99a70..012651228308 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -978,9 +978,9 @@ SbModule* createModImpl(weld::Window* pWin, const
ScriptDocument& rDocument,
rDocument.createModule( aLibName, aModName, bMain, sModuleCode );
BasicManager* pBasMgr = rDocument.getBasicManager();
StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : nullptr;
-if ( pBasic )
-pModule = pBasic->FindModule( aModName );
-SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName,
aModName, TYPE_MODULE );
+if ( pBasic )
+pModule = pBasic->FindModule( aModName );
+SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName,
aModName, TYPE_MODULE );
if (SfxDispatcher* pDispatcher = GetDispatcher())
{
pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
@@ -1074,9 +1074,9 @@ SbModule* createModImpl(weld::Window* pWin, const
ScriptDocument& rDocument,
rDocument.createModule( aLibName, aModName, bMain, sModuleCode );
BasicManager* pBasMgr = rDocument.getBasicManager();
StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : nullptr;
-if ( pBasic )
-pModule = pBasic->FindModule( aModName );
-SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName,
aModName, TYPE_MODULE );
+if ( pBasic )
+pModule = pBasic->FindModule( aModName );
+SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, rDocument, aLibName,
aModName, TYPE_MODULE );
if (SfxDispatcher* pDispatcher = GetDispatcher())
{
pDispatcher->ExecuteList( SID_BASICIDE_SBXINSERTED,
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index bee654fae060..b4258194464a 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -378,7 +378,7 @@ void DlgEditor::SetDialog( const uno::Reference<
container::XNameContainer >& xU
sal_Int16 nTabIndex = -1;
Any aCtrl = xNameAcc->getByName( aName );
Reference< css::beans::XPropertySet > xPSet;
- aCtrl >>= xPSet;
+aCtrl >>= xPSet;
if ( xPSet.is() )
xPSet->getPropertyValue( DLGED_PROP_TABINDEX ) >>= nTabIndex;
@@ -680,8 +680,8 @@ void DlgEditor::Copy()
Reference< container::XNameAccess > xNAcc( xClipDialogModel, UNO_QUERY );
if ( xNAcc.is() )
{
- Sequence< OUString > aNames = xNAcc->getElementNames();
- const OUString* pNames = aNames.getConstArray();
+Sequence< OUString > aNames = xNAcc->getElementNames();
+const OUString* pNames = aNames.getConstArray();
sal_uInt32 nCtrls = aNames.getLength();
for ( sal_uInt32 n = 0; n < nCtrls; n++ )
@@ -713,7 +713,7 @@ void DlgEditor::Copy()
// clone control model
Reference< util::XCloneable > xCtrl;
- aCtrl >>= xCtrl;
+aCtrl >>= xCtrl;
Reference< util::XCloneable > xNewCtrl = xCtrl->createClone();
Any aNewCtrl;
[Libreoffice-commits] core.git: canvas/source canvas/workben chart2/qa chart2/source
canvas/source/cairo/cairo_spritecanvashelper.cxx |3 +-
canvas/source/tools/spriteredrawmanager.cxx |3 +-
canvas/workben/canvasdemo.cxx|2 -
chart2/qa/extras/charttest.hxx |2 -
chart2/source/controller/dialogs/tp_AxisLabel.cxx|2 -
chart2/source/controller/main/ChartController_Properties.cxx |4 +--
chart2/source/controller/main/ControllerCommandDispatch.cxx |6 ++---
chart2/source/controller/main/ShapeController.cxx|2 -
chart2/source/model/main/DataSeriesProperties.cxx|2 -
chart2/source/model/main/Diagram.cxx | 12 +--
chart2/source/model/main/PageBackground.cxx |2 -
chart2/source/tools/ChartTypeHelper.cxx |4 +--
chart2/source/tools/DiagramHelper.cxx|2 -
chart2/source/tools/LinePropertiesHelper.cxx |2 -
chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 10 -
chart2/source/view/main/ShapeFactory.cxx |2 -
16 files changed, 31 insertions(+), 29 deletions(-)
New commits:
commit 21b224211c998e756a7eb03de30d0737e07b2350
Author: Noel Grandin
AuthorDate: Fri Feb 8 09:29:48 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 10:01:20 2019 +0100
loplugin:indentation in canvas..chart2
Change-Id: I9ef57a2e9aaf298f4cfd029aa9b8143871b1bc21
Reviewed-on: https://gerrit.libreoffice.org/67526
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx
b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 149643d432cc..b964db61eed9 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -337,7 +337,8 @@ namespace cairocanvas
const
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
aFirst( rUpdateArea.maComponentList.begin() );
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
- aSecond( aFirst ); ++aSecond;
+ aSecond( aFirst );
+++aSecond;
ENSURE_OR_THROW( aFirst->second.getSprite().is(),
"VCLCanvas::scrollUpdate(): no sprite" );
diff --git a/canvas/source/tools/spriteredrawmanager.cxx
b/canvas/source/tools/spriteredrawmanager.cxx
index f24ef41caf53..b414b8a7ac01 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -335,7 +335,8 @@ namespace canvas
const SpriteConnectedRanges::ComponentListType::const_iterator aFirst(
rUpdateArea.maComponentList.begin() );
SpriteConnectedRanges::ComponentListType::const_iterator aSecond(
-aFirst ); ++aSecond;
+aFirst );
+++aSecond;
if( !aFirst->second.isPureMove() ||
!aSecond->second.isPureMove() ||
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index e144c67b0047..bfb9f400ab28 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -123,7 +123,7 @@ class DemoRenderer
0, 1 );
rendering::FontRequest aFontRequest( aFontInfo, 12.0, 0.0, aLocale
);
uno::Sequence< beans::PropertyValue > aExtraFontProperties;
- mxDefaultFont = xCanvas->createFont( aFontRequest,
aExtraFontProperties, aFontMatrix );
+mxDefaultFont = xCanvas->createFont( aFontRequest,
aExtraFontProperties, aFontMatrix );
if( !mxDefaultFont.is() )
fprintf( stderr, "Failed to create font\n" );
}
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 84d74de2c117..2141ff8a828d 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -593,7 +593,7 @@ awt::Size ChartTest::getPageSize( const Reference<
chart2::XChartDocument > & xC
uno::Reference< com::sun::star::embed::XVisualObject > xVisualObject(
xChartDoc, uno::UNO_QUERY );
CPPUNIT_ASSERT( xVisualObject.is() );
aSize = xVisualObject->getVisualAreaSize(
com::sun::star::embed::Aspects::MSOLE_CONTENT );
-return aSize;
+return aSize;
}
awt::Size ChartTest::getSize(css::uno::Reference xDiagram,
const awt::Size& rPageSize)
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 46e277159bdb..36062526cdd4 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -136,7 +136,7 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet*
rOutAttrs )
void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
{
- const SfxPoolItem* pPoolItem = nullptr;
[Libreoffice-commits] core.git: accessibility/source UnoControls/source
UnoControls/source/controls/progressbar.cxx |2
accessibility/source/extended/AccessibleBrowseBoxBase.cxx |6 -
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx |2
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |4 -
accessibility/source/extended/AccessibleGridControl.cxx |2
accessibility/source/extended/AccessibleGridControlBase.cxx | 38
+-
accessibility/source/extended/accessibleiconchoicectrlentry.cxx |6 -
accessibility/source/extended/accessibletabbarpagelist.cxx |4 -
accessibility/source/extended/textwindowaccessibility.cxx |6 -
accessibility/source/standard/vclxaccessiblelist.cxx|2
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |2
accessibility/source/standard/vclxaccessibletabpage.cxx |2
accessibility/source/standard/vclxaccessibletoolbox.cxx | 10 +-
accessibility/source/standard/vclxaccessibletoolboxitem.cxx |6 -
14 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit 74ed61e793ff9641a2c67b83327b066cb9a1af3d
Author: Noel Grandin
AuthorDate: Fri Feb 8 09:26:40 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 10:02:05 2019 +0100
loplugin:indentation in UnoControls..accessibility
Change-Id: Ib58ac1c7171331eac543eba7b5f7bae8fa04ae4d
Reviewed-on: https://gerrit.libreoffice.org/67524
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/UnoControls/source/controls/progressbar.cxx
b/UnoControls/source/controls/progressbar.cxx
index d18ae7bd7c57..c4937e1f1d66 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -310,7 +310,7 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 nY,
const Reference< XGra
// This paint method is not buffered !!
// Every request paint the completely control. ( but only, if peer exist )
- if ( rGraphics.is () )
+if ( rGraphics.is () )
{
MutexGuard aGuard (m_aMutex);
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 833904ff0418..488d42f7c68c 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -154,8 +154,8 @@ sal_Int32 SAL_CALL
AccessibleBrowseBoxBase::getAccessibleIndexInParent()
}
}
}
- }
- return nRet;
+}
+return nRet;
}
OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription()
@@ -178,7 +178,7 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet()
::osl::MutexGuard aGuard( getMutex() );
ensureIsAlive();
// BrowseBox does not have relations.
- return new utl::AccessibleRelationSetHelper;
+return new utl::AccessibleRelationSetHelper;
}
Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 538a77cba2ae..65de6f691ec7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -120,7 +120,7 @@ Reference< XAccessibleTable > SAL_CALL
AccessibleBrowseBoxHeaderBar::getAccessib
Reference< XAccessibleTable > SAL_CALL
AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders()
{
- SolarMethodGuard aGuard(getMutex());
+SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
return nullptr;// no headers in headers
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 908ccf1fff57..d622f38f0ab7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -74,8 +74,8 @@ namespace accessibility
{
m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ?
sal_Int32(vcl::BBINDEX_FIRSTCONTROL) : _nOffset;
sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos,
_rBrowseBox.GetColumnCount() );
- setAccessibleName( _rBrowseBox.GetAccessibleObjectName(
vcl::BBTYPE_TABLECELL, nIndex ) );
- setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription(
vcl::BBTYPE_TABLECELL, nIndex ) );
+setAccessibleName( _rBrowseBox.GetAccessibleObjectName(
vcl::BBTYPE_TABLECELL, nIndex ) );
+setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription(
vcl::BBTYPE_TABLECELL, nIndex ) );
// Need to register as event listener
Reference< XComponent > xComponent(_rxParent, UNO_QUERY);
if( xComponent.is() )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index a61c39821d0c..9d0a34
[Libreoffice-commits] core.git: codemaker/source comphelper/source
codemaker/source/javamaker/javaoptions.cxx |7 -
comphelper/source/container/embeddedobjectcontainer.cxx |6 -
comphelper/source/misc/accessiblewrapper.cxx|2
comphelper/source/misc/instancelocker.cxx |2
comphelper/source/misc/numberedcollection.cxx | 66
comphelper/source/misc/sequenceashashmap.cxx|6 -
comphelper/source/property/propertystatecontainer.cxx |6 -
comphelper/source/property/propstate.cxx|3
8 files changed, 50 insertions(+), 48 deletions(-)
New commits:
commit 3b9dcfee6492474398011755a92d77320a226604
Author: Noel Grandin
AuthorDate: Fri Feb 8 09:30:19 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 10:01:40 2019 +0100
loplugin:indentation in codemaker..comphelper
Change-Id: I8dee6245cfa1f7998591b31a3752bbbae13f499d
Reviewed-on: https://gerrit.libreoffice.org/67527
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/codemaker/source/javamaker/javaoptions.cxx
b/codemaker/source/javamaker/javaoptions.cxx
index 612b3d6b2d97..2d583e51ac3f 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -86,8 +86,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool
bCmdFile)
case 'n':
if (av[i][2] != 'D' || av[i][3] != '\0')
{
-OString tmp("'-nD', please check");
-tmp += " your input '" + OString(av[i]) + "'";
+OString tmp("'-nD', please check your input '" +
OString(av[i]) + "'");
throw IllegalArgument(tmp);
}
@@ -189,8 +188,8 @@ bool JavaOptions::initOptions(int ac, char* av[], bool
bCmdFile)
if (av[i][0] == '@')
{
FILE* cmdFile = fopen(av[i]+1, "r");
- if( cmdFile == nullptr )
- {
+if( cmdFile == nullptr )
+{
fprintf(stderr, "%s", prepareHelp().getStr());
ret = false;
} else
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 81e5064f34e2..c2e61bcc6f72 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -614,7 +614,7 @@ uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbedde
pImpl->mxStorage, rNewName, aMedium, aObjDescr ),
uno::UNO_QUERY );
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY
);
- OSL_ENSURE( !xObj.is() || xObj->getCurrentState() !=
embed::EmbedStates::LOADED,
+OSL_ENSURE( !xObj.is() || xObj->getCurrentState() !=
embed::EmbedStates::LOADED,
"A freshly create object should be running always!" );
// possible optimization: store later!
@@ -646,7 +646,7 @@ uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::InsertEmbedde
uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY
);
- OSL_ENSURE( !xObj.is() || xObj->getCurrentState() !=
embed::EmbedStates::LOADED,
+OSL_ENSURE( !xObj.is() || xObj->getCurrentState() !=
embed::EmbedStates::LOADED,
"A freshly create object should be running always!" );
// possible optimization: store later!
@@ -791,7 +791,7 @@ uno::Reference < embed::XEmbeddedObject >
EmbeddedObjectContainer::CopyAndGetEmb
}
}
- if ( xResult.is() )
+if ( xResult.is() )
AddEmbeddedObject( xResult, rName );
}
catch (const uno::Exception&)
diff --git a/comphelper/source/misc/accessiblewrapper.cxx
b/comphelper/source/misc/accessiblewrapper.cxx
index b28b2a240e56..9736b031f618 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -242,7 +242,7 @@ namespace comphelper
#if OSL_DEBUG_LEVEL > 0
if ( m_aChildrenMap.end() == aDisposedPos )
{
- OSL_FAIL( "OWrappedAccessibleChildrenManager::disposing: where
did this come from?" );
+OSL_FAIL( "OWrappedAccessibleChildrenManager::disposing: where did
this come from?" );
// helper for diagnostics
Reference< XAccessible > xOwningAccessible( m_aOwningAccessible );
Reference< XAccessibleContext > xContext;
diff --git a/comphelper/source/misc/instancelocker.cxx
b/comphelper/source/misc/instancelocker.cxx
index 61b6338b67ca..43991cec43b1 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -68,7 +68,7 @@ void SAL_CALL OInstanceLocker::dispose()
if ( m_bDisposed )
Re: Principle of least surprise
Wol writes: > On 06/02/2019 22:33, Piet van Oostrum wrote: > > Wols Lists wrote: > > > On 06/02/19 16:08, Piet van Oostrum wrote: > > > Wol's lists writes: > > > > > >> Dunno whether this is a bug or a design decision or what, but it's a > > >> pretty nasty breach of the principle ... > > >> > > >> Why, when I click on a cell, does calc NOT select the clicked cell? > > >> > > >> Okay, I know the answer - it's a hyperlink. BUT. > > >> > > >> I was editing a csv, I've got a column of email addresses, and some > of > > >> them have been hyperlinked, some of them haven't. I don't want > > >> hyperlinks, I didn't ask for hyperlinks, and I can't see any way of > > >> easily removing them! > > >> > > > Format > Clear Direct Formatting (Ctrl-M on my Mac). > > > > > But clicking on the cell doesn't select it so M doesn't work! :-) > > > > You could click in a nearby cell and move to it with the arrows. > > Sorry, I don't know whether it's my poor English or that you aren't a native > speaker, but you seem > to be completely missing my main point. > > THE NEED FOR A WORK-AROUND INDICATES THE EXISTENCE OF A MAJOR UI FUCK-UP! > > Clicking in a cell to select it is such a basic piece of spreadsheet > functionality, that for it to > not work is a major problem. Things like that should work ONE HUNDRED percent > of the time, not > ninety-nine percent. Any safety guy will tell you that something that nearly > always works is > actually far more dangerous than something that keeps going wrong. > > Oh - and I've just played with the same spreadsheet in Excel. That fucks it > up too, just not quite > so dangerously. It selects the cell, which is good, but launches the link at > the same time. So at > least you get a clear visual surprise, unlike Calc which just silently fails > to work as expected > ... No need to SHOUT. I agree that selecting a cell just by clicking is a basic functionality. And so is following a link when you click on it. So now there is a conflict of interests. It would be nice if you had the option to choose which one you prefer, because this is user-dependent. Apparently LO choose to give the link priority. So if you don't like that, switch off the links. See the part of my post that you cut out. -- Piet van Oostrum WWW: http://piet.vanoostrum.org/ PGP key: [8DAE142BE17999C4] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Principle of least surprise
On 08/02/19 09:04, Piet van Oostrum wrote: > Wol writes: > >> On 06/02/2019 22:33, Piet van Oostrum wrote: >> >> Wols Lists wrote: >> >> > On 06/02/19 16:08, Piet van Oostrum wrote: >> > > Wol's lists writes: >> > > >> > >> Dunno whether this is a bug or a design decision or what, but it's >> a >> > >> pretty nasty breach of the principle ... >> > >> >> > >> Why, when I click on a cell, does calc NOT select the clicked cell? >> > >> >> > >> Okay, I know the answer - it's a hyperlink. BUT. >> > >> >> > >> I was editing a csv, I've got a column of email addresses, and >> some of >> > >> them have been hyperlinked, some of them haven't. I don't want >> > >> hyperlinks, I didn't ask for hyperlinks, and I can't see any way of >> > >> easily removing them! >> > >> >> > > Format > Clear Direct Formatting (Ctrl-M on my Mac). >> > > >> > But clicking on the cell doesn't select it so M doesn't work! >> :-) >> > >> >> You could click in a nearby cell and move to it with the arrows. >> >> Sorry, I don't know whether it's my poor English or that you aren't a native >> speaker, but you seem >> to be completely missing my main point. >> >> THE NEED FOR A WORK-AROUND INDICATES THE EXISTENCE OF A MAJOR UI FUCK-UP! >> >> Clicking in a cell to select it is such a basic piece of spreadsheet >> functionality, that for it to >> not work is a major problem. Things like that should work ONE HUNDRED >> percent of the time, not >> ninety-nine percent. Any safety guy will tell you that something that nearly >> always works is >> actually far more dangerous than something that keeps going wrong. >> >> Oh - and I've just played with the same spreadsheet in Excel. That fucks it >> up too, just not quite >> so dangerously. It selects the cell, which is good, but launches the link at >> the same time. So at >> least you get a clear visual surprise, unlike Calc which just silently fails >> to work as expected >> ... > > No need to SHOUT. I agree that selecting a cell just by clicking is a basic > functionality. And so is following a link when you click on it. So now there > is a conflict of interests. It would be nice if you had the option to choose > which one you prefer, because this is user-dependent. Apparently LO choose to > give the link priority. So if you don't like that, switch off the links. See > the part of my post that you cut out. > Sorry. But if that's the case, why does LO do NEITHER? Point is, if I'm using calc, I'm using a spreadsheet. I expect it to behave like a spreadsheet, not a browser. And the current functionality is DANGEROUS. I shouldn't have to go and change the options to make calc behave like a spreadsheet. As I said, I only discovered this because I was using calc *as a spreadsheet* and suddenly discovered that it was (a) making changes behind my back, and (b) as a result of those changes, I'd damaged my spreadsheet! Again, we can probably blame it on Microsoft :-) but really I would prefer my spreadsheet to behave like a spreadsheet, not a browser. And that's why I was shouting. You're not addressing my point which is that, imho, it is a *major* design fail for the *default* behaviour to suddenly behave in a completely different (*and* *dangerous*) way. If you're in a car, would you really like a corner case, where, every time, by default the car swapped the brake and accelerator over if you were turning right in third gear? The car is being completely deterministic - all you have to do is remember to use the other foot! Maybe I'm too naive, but should I really have to mess around with the settings to get a single-click to work the same way here as it does EVERYWHERE else? Oh - and this has ramifications elsewhere. Probably the easiest way for me to try and fix this is that whenever calc converts text to a hyperlink, is to just Z to undo the hyperlink. Except last time I hit this in calc, Z didn't work that way, I just could NOT disable calc's autoformat. Oh - and the standard way of disabling the autoformat didn't work because it was doing it elsewhere. I think I need to go and see whether that UI nightmare has been fixed ... Please. I *don't* want to have to fuck about with the settings, in order to make calc behave like a spreadsheet! Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl svx/source svx/uiconfig vcl/source vcl/unx
include/vcl/weld.hxx |7 +
svx/source/form/datanavi.cxx | 82 ++--
svx/source/form/xfm_addcondition.cxx |4
svx/source/inc/datanavi.hxx | 30 ++
svx/uiconfig/ui/addconditiondialog.ui | 169 +++---
svx/uiconfig/ui/namespacedialog.ui|1
vcl/source/app/salvtables.cxx | 12 ++
vcl/unx/gtk3/gtk3gtkinst.cxx | 29 +
8 files changed, 195 insertions(+), 139 deletions(-)
New commits:
commit eb25b3c94053b4b614d7c8f983158d6519e530c1
Author: Caolán McNamara
AuthorDate: Thu Feb 7 21:19:37 2019 +
Commit: Caolán McNamara
CommitDate: Fri Feb 8 10:59:15 2019 +0100
weld AddConditionDialog
Change-Id: Ib685ea89b31c1f000bc2276e3362ba059f997422
Reviewed-on: https://gerrit.libreoffice.org/67521
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index bcb6a898105a..e4248c61a314 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1231,6 +1231,11 @@ class VCL_DLLPUBLIC TextView : virtual public Container
private:
OUString m_sSavedValue;
+protected:
+Link m_aChangeHdl;
+
+void signal_changed() { m_aChangeHdl.Call(*this); }
+
public:
virtual void set_text(const OUString& rText) = 0;
virtual OUString get_text() const = 0;
@@ -1246,6 +1251,8 @@ public:
void save_value() { m_sSavedValue = get_text(); }
bool get_value_changed_from_saved() const { return m_sSavedValue !=
get_text(); }
+
+void connect_changed(const Link& rLink) { m_aChangeHdl =
rLink; }
};
class VCL_DLLPUBLIC Expander : virtual public Container
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 6b241324b353..0f064627489c 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2372,7 +2372,7 @@ namespace svxform
sPropName = PN_READONLY_EXPR;
else if (m_pCalculateBtn == pBtn)
sPropName = PN_CALCULATE_EXPR;
-ScopedVclPtrInstance< AddConditionDialog > aDlg(this, sPropName,
m_xTempBinding);
+AddConditionDialog aDlg(GetFrameWeld(), sPropName, m_xTempBinding);
bool bIsDefBtn = ( m_pDefaultBtn == pBtn );
OUString sCondition;
if ( bIsDefBtn )
@@ -2384,11 +2384,11 @@ namespace svxform
sTemp = TRUE_VALUE;
sCondition = sTemp;
}
-aDlg->SetCondition( sCondition );
+aDlg.SetCondition( sCondition );
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
{
-OUString sNewCondition = aDlg->GetCondition();
+OUString sNewCondition = aDlg.GetCondition();
if ( bIsDefBtn )
m_pDefaultED->SetText( sNewCondition );
else
@@ -2732,28 +2732,27 @@ namespace svxform
m_pItemFrame->set_label(sText);
}
-AddConditionDialog::AddConditionDialog(vcl::Window* pParent,
+AddConditionDialog::AddConditionDialog(weld::Window* pParent,
const OUString& _rPropertyName,
const Reference< XPropertySet >& _rPropSet)
-: ModalDialog(pParent, "AddConditionDialog",
"svx/ui/addconditiondialog.ui")
+: GenericDialogController(pParent, "svx/ui/addconditiondialog.ui",
"AddConditionDialog")
, m_sPropertyName(_rPropertyName)
, m_xBinding(_rPropSet)
-
+, m_xConditionED(m_xBuilder->weld_text_view("condition"))
+, m_xResultWin(m_xBuilder->weld_text_view("result"))
+, m_xEditNamespacesBtn(m_xBuilder->weld_button("edit"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
{
-get(m_pConditionED, "condition");
-get(m_pResultWin, "result");
-get(m_pEditNamespacesBtn, "edit");
-get(m_pOKBtn, "ok");
DBG_ASSERT( m_xBinding.is(), "AddConditionDialog::Ctor(): no Binding"
);
-m_pConditionED->set_height_request(m_pConditionED->GetTextHeight() *
4);
-
m_pConditionED->set_width_request(m_pConditionED->approximate_char_width() *
62);
-m_pResultWin->set_height_request(m_pResultWin->GetTextHeight() * 4);
-m_pResultWin->set_width_request(m_pResultWin->approximate_char_width()
* 62);
+
m_xConditionED->set_size_request(m_xConditionED->get_approximate_digit_width()
* 52,
+ m_xConditionED->get_height_rows(4));
+
m_xResultWin->set_size_request(m_xResultWin->get_approximate_digit_width() * 52,
+ m_xResultWin->get_height_rows(4));
-m_pConditionED->SetModifyHdl( LINK( this, AddConditionDialog,
ModifyHdl ) );
-m_pEditNamespacesBtn->SetClickHdl( LINK( this, AddConditionDialog,
EditHdl ) );
-m_pOKBtn->SetClickHdl( LINK( this, AddConditionDialog, OKHdl ) );
+m_xConditionED->connect_changed( LINK( this, AddConditionDialog,
ModifyHdl ) );
+m_xEditNamespa
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 11 ---
1 file changed, 11 deletions(-)
New commits:
commit 6ff24b994e34d343e5e91b99b971aa43a841341e
Author: Caolán McNamara
AuthorDate: Fri Feb 8 09:06:06 2019 +
Commit: Caolán McNamara
CommitDate: Fri Feb 8 11:11:53 2019 +0100
drop propagate natural
rather than have version specific behaviour
Change-Id: I75866a45859f93d290f79c63b586fee2a19816f3
Reviewed-on: https://gerrit.libreoffice.org/67529
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 58ab06ca987f..ac8f05a65776 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7842,17 +7842,6 @@ private:
if (gtk_label_get_use_underline(pLabel))
m_aMnemonicLabels.push_back(pLabel);
}
-else if (GTK_IS_SCROLLED_WINDOW(pWidget))
-{
-#if GTK_CHECK_VERSION(3, 22, 0)
-// while the .ui version is 3.18, do this in code when possible
-if (gtk_check_version(3, 22, 0) == nullptr)
-{
-
gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(pWidget),
true);
-
gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(pWidget),
true);
-}
-#endif
-}
else if (GTK_IS_WINDOW(pWidget))
{
if (m_pStringReplace != nullptr) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source svx/uiconfig
svx/source/form/datanavi.cxx | 140 +++--
svx/source/inc/datanavi.hxx| 30 +++
svx/uiconfig/ui/addsubmissiondialog.ui | 23 +++--
3 files changed, 96 insertions(+), 97 deletions(-)
New commits:
commit c953ff6ce59001323a05a4f398fd354fac5e559d
Author: Caolán McNamara
AuthorDate: Fri Feb 8 09:26:45 2019 +
Commit: Caolán McNamara
CommitDate: Fri Feb 8 11:33:45 2019 +0100
weld AddSubmissionDialog
Change-Id: Ib56b22743ef6b9eb849291f9d8eba02450e3fc68
Reviewed-on: https://gerrit.libreoffice.org/67531
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 0f064627489c..9d433ff6a5fb 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -489,12 +489,12 @@ namespace svxform
DBG_ASSERT( xModel.is(), "XFormsPage::DoToolBoxAction(): Action
without model" );
if ( DGTSubmission == m_eGroup )
{
-ScopedVclPtrInstance< AddSubmissionDialog > aDlg( this,
nullptr, m_xUIHelper );
-if ( aDlg->Execute() == RET_OK &&
aDlg->GetNewSubmission().is() )
+AddSubmissionDialog aDlg(GetFrameWeld(), nullptr, m_xUIHelper);
+if ( aDlg.run() == RET_OK && aDlg.GetNewSubmission().is() )
{
try
{
-Reference< css::xforms::XSubmission > xNewSubmission =
aDlg->GetNewSubmission();
+Reference< css::xforms::XSubmission > xNewSubmission =
aDlg.GetNewSubmission();
Reference< XSet > xSubmissions(
xModel->getSubmissions(), UNO_QUERY );
xSubmissions->insert( makeAny( xNewSubmission ) );
Reference< XPropertySet > xNewPropSet( xNewSubmission,
UNO_QUERY );
@@ -752,9 +752,9 @@ namespace svxform
}
else
{
-ScopedVclPtrInstance< AddSubmissionDialog > aDlg( this,
pNode, m_xUIHelper );
-aDlg->SetText( SvxResId( RID_STR_DATANAV_EDIT_SUBMISSION )
);
-if ( aDlg->Execute() == RET_OK )
+AddSubmissionDialog aDlg(GetFrameWeld(), pNode,
m_xUIHelper);
+aDlg.set_title(SvxResId(RID_STR_DATANAV_EDIT_SUBMISSION));
+if (aDlg.run() == RET_OK)
{
EditEntry( pNode->m_xPropSet );
bIsDocModified = true;
@@ -3039,63 +3039,47 @@ namespace svxform
}
AddSubmissionDialog::AddSubmissionDialog(
-vcl::Window* pParent, ItemNode* _pNode,
+weld::Window* pParent, ItemNode* _pNode,
const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
-: ModalDialog(pParent, "AddSubmissionDialog",
-"svx/ui/addsubmissiondialog.ui")
+: GenericDialogController(pParent, "svx/ui/addsubmissiondialog.ui",
"AddSubmissionDialog")
, m_pItemNode(_pNode)
, m_xUIHelper(_rUIHelper)
+, m_xNameED(m_xBuilder->weld_entry("name"))
+, m_xActionED(m_xBuilder->weld_entry("action"))
+, m_xMethodLB(m_xBuilder->weld_combo_box("method"))
+, m_xRefED(m_xBuilder->weld_entry("expression"))
+, m_xRefBtn(m_xBuilder->weld_button("browse"))
+, m_xBindLB(m_xBuilder->weld_combo_box("binding"))
+, m_xReplaceLB(m_xBuilder->weld_combo_box("replace"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
{
-get(m_pNameED, "name");
-get(m_pActionED, "action");
-get(m_pMethodLB, "method");
-get(m_pRefED, "expression");
-get(m_pRefBtn, "browse");
-get(m_pBindLB, "binding");
-get(m_pReplaceLB, "replace");
-get(m_pOKBtn, "ok");
FillAllBoxes();
-m_pRefBtn->SetClickHdl( LINK( this, AddSubmissionDialog, RefHdl ) );
-m_pOKBtn->SetClickHdl( LINK( this, AddSubmissionDialog, OKHdl ) );
+m_xRefBtn->connect_clicked( LINK( this, AddSubmissionDialog, RefHdl )
);
+m_xOKBtn->connect_clicked( LINK( this, AddSubmissionDialog, OKHdl ) );
}
-
AddSubmissionDialog::~AddSubmissionDialog()
{
-disposeOnce();
-}
-
-void AddSubmissionDialog::dispose()
-{
// #i38991# if we have added a binding, we need to remove it as well.
if( m_xCreatedBinding.is() && m_xUIHelper.is() )
m_xUIHelper->removeBindingIfUseless( m_xCreatedBinding );
-m_pNameED.clear();
-m_pActionED.clear();
-m_pMethodLB.clear();
-m_pRefED.clear();
-m_pRefBtn.clear();
-m_pBindLB.clear();
-m_pReplaceLB.clear();
-m_pOKBtn.clear();
-ModalDialog::dispose();
}
-IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl, Button*, void)
+IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl, weld
[Libreoffice-commits] core.git: svx/source svx/uiconfig
svx/source/form/datanavi.cxx | 255 +++
svx/source/inc/datanavi.hxx | 61 +++-
svx/uiconfig/ui/adddataitemdialog.ui | 130 +
3 files changed, 206 insertions(+), 240 deletions(-)
New commits:
commit 2d6313a9fac81340883b24fe3651781d31c6039d
Author: Caolán McNamara
AuthorDate: Fri Feb 8 10:00:03 2019 +
Commit: Caolán McNamara
CommitDate: Fri Feb 8 11:52:16 2019 +0100
weld AddDataItemDialog
Change-Id: I579d6d555b0f01df22e6f97912712a9ec2bf69a6
Reviewed-on: https://gerrit.libreoffice.org/67532
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 9d433ff6a5fb..7f3773061e97 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -616,10 +616,10 @@ namespace svxform
}
}
-ScopedVclPtrInstance< AddDataItemDialog > aDlg( this,
pNode.get(), m_xUIHelper );
-aDlg->SetText( SvxResId( pResId ) );
-aDlg->InitText( eType );
-short nReturn = aDlg->Execute();
+AddDataItemDialog aDlg(GetFrameWeld(), pNode.get(),
m_xUIHelper);
+aDlg.set_title(SvxResId(pResId));
+aDlg.InitText( eType );
+short nReturn = aDlg.run();
if ( DGTInstance == m_eGroup )
{
if ( RET_OK == nReturn )
@@ -687,7 +687,7 @@ namespace svxform
return bHandled;
}
-ScopedVclPtrInstance< AddDataItemDialog > aDlg( this,
pNode, m_xUIHelper );
+AddDataItemDialog aDlg(GetFrameWeld(), pNode, m_xUIHelper);
DataItemType eType = DITElement;
const char* pResId = RID_STR_DATANAV_EDIT_ELEMENT;
if ( pNode && pNode->m_xNode.is() )
@@ -711,9 +711,9 @@ namespace svxform
pResId = RID_STR_DATANAV_EDIT_BINDING;
eType = DITBinding;
}
-aDlg->SetText( SvxResId( pResId ) );
-aDlg->InitText( eType );
-if ( aDlg->Execute() == RET_OK )
+aDlg.set_title(SvxResId(pResId));
+aDlg.InitText( eType );
+if (aDlg.run() == RET_OK)
{
// Set the new name
OUString sNewName;
@@ -2229,9 +2229,9 @@ namespace svxform
static_cast(GetWindow())->Initialize( _pInfo );
}
-AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode*
_pNode,
+AddDataItemDialog::AddDataItemDialog(weld::Window* pParent, ItemNode*
_pNode,
const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
-: ModalDialog(pParent, "AddDataItemDialog" ,
"svx/ui/adddataitemdialog.ui")
+: GenericDialogController(pParent, "svx/ui/adddataitemdialog.ui",
"AddDataItemDialog")
, m_xUIHelper(_rUIHelper)
, m_pItemNode(_pNode)
, m_eItemType(DITNone)
@@ -2239,43 +2239,35 @@ namespace svxform
, m_sFL_Attribute(SvxResId(RID_STR_ATTRIBUTE))
, m_sFL_Binding(SvxResId(RID_STR_BINDING))
, m_sFT_BindingExp(SvxResId(RID_STR_BINDING_EXPR))
+, m_xItemFrame(m_xBuilder->weld_frame("itemframe"))
+, m_xNameFT(m_xBuilder->weld_label("nameft"))
+, m_xNameED(m_xBuilder->weld_entry("name"))
+, m_xDefaultFT(m_xBuilder->weld_label("valueft"))
+, m_xDefaultED(m_xBuilder->weld_entry("value"))
+, m_xDefaultBtn(m_xBuilder->weld_button("browse"))
+, m_xSettingsFrame(m_xBuilder->weld_widget("settingsframe"))
+, m_xDataTypeFT(m_xBuilder->weld_label("datatypeft"))
+, m_xDataTypeLB(m_xBuilder->weld_combo_box("datatype"))
+, m_xRequiredCB(m_xBuilder->weld_check_button("required"))
+, m_xRequiredBtn(m_xBuilder->weld_button("requiredcond"))
+, m_xRelevantCB(m_xBuilder->weld_check_button("relevant"))
+, m_xRelevantBtn(m_xBuilder->weld_button("relevantcond"))
+, m_xConstraintCB(m_xBuilder->weld_check_button("constraint"))
+, m_xConstraintBtn(m_xBuilder->weld_button("constraintcond"))
+, m_xReadonlyCB(m_xBuilder->weld_check_button("readonly"))
+, m_xReadonlyBtn(m_xBuilder->weld_button("readonlycond"))
+, m_xCalculateCB(m_xBuilder->weld_check_button("calculate"))
+, m_xCalculateBtn(m_xBuilder->weld_button("calculatecond"))
+, m_xOKBtn(m_xBuilder->weld_button("ok"))
{
-get(m_pItemFrame, "itemframe");
-get(m_pNameFT, "nameft");
-get(m_pNameED, "name");
-get(m_pDefaultFT, "valueft");
-get(m_pDefaultED, "value");
-get(m_pDefaultBtn, "browse");
-get(m_pSettingsFrame, "settingsframe");
-
[Libreoffice-commits] core.git: tools/source ucb/source vbahelper/source vcl/android vcl/headless vcl/inc vcl/ios vcl/opengl vcl/osx vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win writerperfect/qa writ
tools/source/fsys/fileutil.cxx|9 +- tools/source/xml/XmlWalker.cxx|3 tools/source/xml/XmlWriter.cxx|3 ucb/source/ucp/ftp/ftpcontent.cxx |3 ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx |3 ucb/source/ucp/webdav/webdavcontentcaps.cxx |3 ucb/source/ucp/webdav/webdavdatasupplier.cxx |5 - vbahelper/source/msforms/vbauserform.cxx |3 vcl/android/androidinst.cxx |3 vcl/headless/headlessinst.cxx |3 vcl/headless/svpdata.cxx |3 vcl/inc/BitmapScaleConvolutionFilter.hxx |7 - vcl/inc/font/FeatureCollector.hxx |1 vcl/inc/pch/precompiled_vcl.hxx |1 vcl/ios/iosinst.cxx |3 vcl/opengl/FixedTextureAtlas.cxx |4 - vcl/opengl/salbmp.cxx | 11 +-- vcl/osx/salinst.cxx |3 vcl/qt5/Qt5Graphics_Text.cxx |3 vcl/qt5/Qt5Instance.cxx |3 vcl/quartz/salbmp.cxx | 13 +-- vcl/quartz/salgdi.cxx |3 vcl/source/app/salvtables.cxx | 79 ++ vcl/source/app/svdata.cxx |3 vcl/source/control/button.cxx |3 vcl/source/edit/texteng.cxx | 13 +-- vcl/source/edit/textview.cxx |8 -- vcl/source/filter/graphicfilter.cxx |7 - vcl/source/filter/igif/gifread.cxx|3 vcl/source/filter/ipdf/pdfdocument.cxx|3 vcl/source/font/FeatureCollector.cxx |1 vcl/source/gdi/impgraph.cxx | 11 +-- vcl/source/gdi/impvect.cxx|3 vcl/source/gdi/pdfwriter_impl.cxx |5 - vcl/source/gdi/pngread.cxx|9 +- vcl/source/gdi/region.cxx | 21 ++--- vcl/source/gdi/svmconverter.cxx |3 vcl/source/gdi/wall.cxx | 21 ++--- vcl/source/graphic/Manager.cxx|1 vcl/source/treelist/svtabbx.cxx |3 vcl/source/treelist/treelist.cxx |3 vcl/source/treelist/treelistbox.cxx |8 +- vcl/source/uitest/uno/uiobject_uno.cxx|3 vcl/source/window/builder.cxx |9 +- vcl/source/window/errinf.cxx |5 - vcl/unx/generic/app/salinst.cxx |3 vcl/unx/generic/gdi/cairotextrender.cxx |3 vcl/unx/generic/gdi/salvd.cxx |3 vcl/unx/generic/print/genpspgraphics.cxx |3 vcl/unx/gtk/gtkinst.cxx |5 - vcl/unx/gtk3/gtk3gtkinst.cxx | 60 vcl/unx/kde5/KDE5SalInstance.cxx |1 vcl/win/app/salinst.cxx |3 vcl/win/gdi/winlayout.cxx |3 writerperfect/qa/unit/DirectoryStreamTest.cxx |2 writerperfect/source/common/DirectoryStream.cxx |4 - xmlhelp/source/cxxhelp/provider/content.cxx |5 - xmloff/inc/pch/precompiled_xo.hxx |1 xmloff/source/chart/MultiPropertySetHandler.hxx |3 xmloff/source/chart/SchXMLImport.cxx | 23 +++--- xmloff/source/core/unoatrcn.cxx |3 xmloff/source/core/xmlexp.cxx |5 - xmloff/source/core/xmlimp.cxx | 21 ++--- xmloff/source/draw/animationimport.cxx|6 - xmloff/source/draw/sdxmlimp.cxx | 21 ++--- xmloff/source/draw/shapeexport.cxx|3 xmloff/source/draw/shapeimport.cxx| 18 ++--- xmloff/source/draw/xexptran.cxx |3 xmloff/source/draw/ximpcustomshape.cxx|3 xmloff/source/draw/ximpstyl.cxx |5 - xmloff/source/forms/controlpropertyhdl.cxx| 18 ++--- xmloff/source/forms/elementexport.cxx |6 - xmloff/source/forms/propertyexport.cxx|4 - xmloff/source/style/impastpl.cxx |8 +- xmloff/source/style/xmlnumfi.cxx | 16 +--- xmloff/source/style/xmlnumi.cxx |3 xmloff/source/style/xmlstyle.cxx |3 xmloff/source/style/xmltabi.cxx |3 xmloff/source/text/XMLTextColumnsContext.cxx |3 xmloff/source/text/XMLTextFrameContext.cxx|3 xmloff/source/text/txtlists.cxx | 10 +- xmloff/source/text/txtparae.cxx |3 xmloff/source/text/txtparai.cxx
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - bin/symstore.sh Makefile.in
Makefile.in |1
bin/symstore.sh | 85
2 files changed, 86 insertions(+)
New commits:
commit 2dc7e049437af20269967a761dcf6c6bd6c77e68
Author: Thorsten Behrens
AuthorDate: Sun Jan 15 11:50:27 2017 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 8 12:52:18 2019 +0100
gbuild: populate local symstore on Windows
Script based on Lubos' tb master script from
http://nabble.documentfoundation.org/Daily-Win32-debug-builds-td4067279.html
Also includes:
- shellcheck: cleanup symstore.sh
- Symstore: Also add .exe and .dlls to symstore
Change-Id: I7f3247367a63078881f3cf51cf3e2cad59ad67b5
Reviewed-on: https://gerrit.libreoffice.org/33088
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit 17e9a5bf94eb08f88f8c78c9982dd0ce48a5e2d9)
diff --git a/Makefile.in b/Makefile.in
index f1bd93b4b72f..a51b17a3bdda 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -387,6 +387,7 @@ symbols:
mkdir -p $(WORKDIR)/symbols/
ifeq ($(OS),WNT)
$(SRCDIR)/bin/symbolstore.py
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/windows/binaries/dump_syms.exe
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
+ $(SRCDIR)/bin/symstore.sh
else
$(SRCDIR)/bin/symbolstore.py
$(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms
$(WORKDIR)/symbols/ $(INSTDIR)/program/*
endif
diff --git a/bin/symstore.sh b/bin/symstore.sh
new file mode 100755
index ..b368eb3e6715
--- /dev/null
+++ b/bin/symstore.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+
+add_pdb()
+{
+extension=$1
+type=$2
+list=$3
+for file in $(find "${INSTDIR}/" -name "*.${extension}"); do
+# store dll/exe itself (needed for minidumps)
+if [ -f "$file" ]; then
+cygpath -w "$file" >> "$list"
+fi
+# store pdb file
+filename=$(basename "$file" ".${extension}")
+pdb="${WORKDIR}/LinkTarget/${type}/${filename}.pdb"
+if [ -f "$pdb" ]; then
+cygpath -w "$pdb" >> "$list"
+fi
+done
+}
+
+# check preconditions
+if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then
+echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv"
+exit 1
+fi
+if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then
+echo "INSTDIR or WORKDIR not present - script expects calling after full
build"
+exit 1
+fi
+which symstore.exe > /dev/null 2>&1 || {
+echo "symstore.exe is expected in the PATH"
+exit 1
+}
+
+# defaults
+MAX_KEEP=5
+SYM_PATH=${WORKDIR}/symstore
+
+USAGE="Usage: $0 [-h|-k |-p ]
+ -h: this cruft
+ -k : keep this number of old symbol versions around
+ (default: ${MAX_KEEP}. Set to 0 for unlimited)
+ -p : specify full path to symbol store tree
+If no path is specified, defaults to ${SYM_PATH}.
+"
+
+# process args
+while :
+do
+ case "$1" in
+-k|--keep) MAX_KEEP="$2"; shift 2;;
+-p|--path) SYM_PATH="$2"; shift 2;;
+-h|--help) echo "${USAGE}"; exit 0; shift;;
+-*) echo "${USAGE}" >&2; exit 1;;
+*) break;;
+ esac
+done
+
+if [ $# -gt 0 ]; then
+echo "${USAGE}" >&2
+exit 1
+fi
+
+# populate symbol store from here
+TMPFILE=$(mktemp) || exit 1
+trap '{ rm -f ${TMPFILE}; }' EXIT
+
+# add dlls and executables
+add_pdb dll Library "${TMPFILE}"
+add_pdb exe Executable "${TMPFILE}"
+
+# stick all of it into symbol store
+symstore.exe add /compress /f "@$(cygpath -w "${TMPFILE}")" /s "$(cygpath -w
"${SYM_PATH}")" /t "${PRODUCTNAME}" /v
"${LIBO_VERSION_MAJOR}.${LIBO_VERSION_MINOR}.${LIBO_VERSION_MICRO}.${LIBO_VERSION_PATCH}${LIBO_VERSION_SUFFIX}${LIBO_VERSION_SUFFIX_SUFFIX}"
+rm -f "${TMPFILE}"
+
+# Cleanup symstore, older revisions will be removed. Unless the
+# .dll/.exe changes, the .pdb should be shared, so with incremental
+# tinderbox several revisions should not be that space-demanding.
+if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then
+to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v
'\.deleted' | sort | head -n "-${MAX_KEEP}")
+for revision in $to_remove; do
+symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")"
+done
+fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppuhelper/source cppu/source cui/source
cppu/source/LogBridge/LogBridge.cxx | 10 ++--
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx |2
cppu/source/uno/cascade_mapping.cxx |4 -
cppuhelper/source/implementationentry.cxx |2
cppuhelper/source/interfacecontainer.cxx|6 +-
cppuhelper/source/propshlp.cxx | 28 ++--
cppuhelper/source/servicemanager.cxx|3 -
cui/source/customize/SvxToolbarConfigPage.cxx |2
cui/source/customize/cfg.cxx| 14 +++---
cui/source/dialogs/SpellDialog.cxx |2
cui/source/dialogs/colorpicker.cxx | 14 +++---
cui/source/dialogs/hldocntp.cxx |2
cui/source/dialogs/hldoctp.cxx |2
cui/source/dialogs/insdlg.cxx |4 -
cui/source/dialogs/scriptdlg.cxx| 46 ++--
cui/source/options/connpoolconfig.cxx |4 -
cui/source/options/optaboutconfig.cxx |2
cui/source/options/optgenrl.cxx | 10 ++--
cui/source/options/optopencl.cxx|2
cui/source/tabpages/autocdlg.cxx|2
cui/source/tabpages/chardlg.cxx |2
cui/source/tabpages/numpages.cxx|2
cui/source/tabpages/swpossizetabpage.cxx|2
cui/source/tabpages/tpline.cxx |6 +-
24 files changed, 87 insertions(+), 86 deletions(-)
New commits:
commit a58f6d2744fde88f2034987208124e5b2505c641
Author: Noel Grandin
AuthorDate: Fri Feb 8 13:13:42 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 13:16:15 2019 +0100
loplugin:indentation in cppu..cui
Change-Id: If625e5bf38ca8e1f12686038c7c9be8d0303b6f6
Reviewed-on: https://gerrit.libreoffice.org/67536
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cppu/source/LogBridge/LogBridge.cxx
b/cppu/source/LogBridge/LogBridge.cxx
index 4c83de9f0aa6..a39fbad6f0ff 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -205,7 +205,7 @@ static void LogProbe(
SAL_INFO("cppu.log", "{ LogBridge () " << sTemp );
if ( nParams )
{
- SAL_INFO("cppu.log", "\n| : ( LogBridge ");
+SAL_INFO("cppu.log", "\n| : ( LogBridge ");
for(sal_Int32 i = 0;i < nParams;++i)
{
if ( i > 0 )
@@ -213,9 +213,9 @@ static void LogProbe(
traceValue(pParams[i].pTypeRef,pArgs[i]);
}
- SAL_INFO("cppu.log", ")");
+SAL_INFO("cppu.log", ")");
} // if ( nParams )
- SAL_INFO("cppu.log", "\n");
+SAL_INFO("cppu.log", "\n");
}
else if ( !pre )
{
@@ -230,11 +230,11 @@ static void LogProbe(
}
else if ( pReturnTypeRef )
{
- SAL_INFO("cppu.log", " return : ");
+SAL_INFO("cppu.log", " return : ");
traceValue(pReturnTypeRef,pReturn);
} // if ( pReturn && pReturnTypeRef )
- SAL_INFO("cppu.log", "\n");
+SAL_INFO("cppu.log", "\n");
}
}
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index b6f5ffbe31aa..f62241fe13d6 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -184,7 +184,7 @@ static void s_acquireAndRegister_v(va_list * pParam)
uno_ExtEnvironment * pEnv = va_arg(*pParam,
uno_ExtEnvironment *);
pUnoI->acquire(pUnoI);
- pEnv->registerInterface(pEnv, reinterpret_cast(&pUnoI), pOid,
pTypeDescr);
+pEnv->registerInterface(pEnv, reinterpret_cast(&pUnoI), pOid,
pTypeDescr);
}
}
diff --git a/cppu/source/uno/cascade_mapping.cxx
b/cppu/source/uno/cascade_mapping.cxx
index 3cb34a65bb1c..7d44296ea062 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -271,14 +271,14 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
OUString envDcp = uno_envType;
envDcp += from_envPurpose;
- uno_getEnvironment(&pInterm, envDcp.pData, nullptr);
+uno_getEnvironment(&pInterm, envDcp.pData, nullptr);
}
else if (from_envType == uno_envType && to_envType != uno_envType) // UNO
-> ?
// mediate via uno(context)
{
OUString envDcp = uno_envType;
- envDcp += to_envPurpose;
+envDcp += to_envPurpose;
uno_getEnvironment(&pInterm, envDcp.pData, nullptr);
}
else // everything else
diff --git a/cppuhelper/source/implementationentry.cxx
b/cppuhelper/source/implementationentry.cxx
index 466d766558af..2e5891982b8e 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -65,7 +65,7 @@
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/toolbar.css|2 +-
loleaflet/images/lc_basicshapes.cube.svg |7 +--
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit f695e36aa9cf9d51e5946c4e539f42ab2eb4f4e4
Author: Henry Castro
AuthorDate: Fri Feb 8 08:24:28 2019 -0400
Commit: Henry Castro
CommitDate: Fri Feb 8 08:37:40 2019 -0400
loleaflet: update basic shape cube icon
Change-Id: I5b3edd8245ef24039857f9a5a988003c15f50c49
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 93d9f9215..2e52c04ed 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -322,7 +322,7 @@ button.leaflet-control-search-next
.w2ui-icon.basicshapes_ring { background:
url('images/lc_basicshapes.ring.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_block-arc { background:
url('images/lc_basicshapes.block-arc.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_can { background: url('images/lc_basicshapes.can.svg')
no-repeat center !important; }
-.w2ui-icon.basicshapes_cube { background: url('images/lc_cube.svg') no-repeat
center !important; }
+.w2ui-icon.basicshapes_cube { background:
url('images/lc_basicshapes.cube.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_paper { background:
url('images/lc_basicshapes.paper.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_frame { background: url('images/lc_rect_unfilled.svg')
no-repeat center !important; }
diff --git a/loleaflet/images/lc_basicshapes.cube.svg
b/loleaflet/images/lc_basicshapes.cube.svg
index e754b185a..36317ef15 100644
--- a/loleaflet/images/lc_basicshapes.cube.svg
+++ b/loleaflet/images/lc_basicshapes.cube.svg
@@ -1,6 +1 @@
-http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
-
-
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source desktop/source drawinglayer/source
dbaccess/source/core/api/CacheSet.cxx |2 -
dbaccess/source/core/api/RowSet.cxx |2 -
dbaccess/source/core/dataaccess/databasedocument.cxx |2 -
dbaccess/source/core/dataaccess/documentcontainer.cxx |6 +--
dbaccess/source/filter/xml/dbloader2.cxx |2 -
dbaccess/source/filter/xml/xmlfilter.cxx |2 -
dbaccess/source/ui/app/AppController.cxx |2 -
dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 -
dbaccess/source/ui/browser/formadapter.cxx|2 -
dbaccess/source/ui/browser/genericcontroller.cxx |2 -
dbaccess/source/ui/browser/sbagrid.cxx| 12 +++---
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |2 -
dbaccess/source/ui/misc/TokenWriter.cxx |2 -
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx|4 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 16
dbaccess/source/ui/tabledesign/TableDesignView.cxx|2 -
dbaccess/source/ui/tabledesign/TableFieldControl.cxx |2 -
dbaccess/source/ui/tabledesign/TableUndo.cxx |4 +-
dbaccess/source/ui/uno/copytablewizard.cxx|2 -
desktop/source/app/check_ext_deps.cxx |2 -
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |2 -
desktop/source/deployment/registry/component/dp_component.cxx |6 +--
desktop/source/deployment/registry/package/dp_package.cxx | 18 +-
desktop/source/migration/services/wordbookmigration.cxx |4 +-
desktop/source/pkgchk/unopkg/unopkg_app.cxx |2 -
desktop/source/pkgchk/unopkg/unopkg_misc.cxx |2 -
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |2 -
drawinglayer/source/processor3d/cutfindprocessor3d.cxx|2 -
drawinglayer/source/tools/wmfemfhelper.cxx|2 -
29 files changed, 55 insertions(+), 57 deletions(-)
New commits:
commit 347571a6873a4b6bce8733e476fa902830d1a644
Author: Noel Grandin
AuthorDate: Fri Feb 8 13:14:17 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 13:39:15 2019 +0100
loplugin:indentation in dbaccess..drawinglayer
Change-Id: I05de6c01e827e596c9802c04964f43508dfd4d64
Reviewed-on: https://gerrit.libreoffice.org/67537
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/core/api/CacheSet.cxx
b/dbaccess/source/core/api/CacheSet.cxx
index fe930722ab68..6d230f9361c4 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -310,7 +310,7 @@ void OCacheSet::updateRow(const ORowSetRow& _rInsertRow
,const ORowSetRow& _rOri
++i;
}
- m_bUpdated = xPrep->executeUpdate() > 0;
+m_bUpdated = xPrep->executeUpdate() > 0;
}
void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const
connectivity::OSQLTable& _xTable )
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index f390467422f2..6da73ff09fd3 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -769,7 +769,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32
columnIndex, const Referenc
checkUpdateConditions(columnIndex);
checkUpdateIterator();
- {
+{
Sequence aSeq;
if(x.is())
x->readBytes(aSeq,length);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index c20bb36c3566..4eb8613d683c 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -457,7 +457,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const
Reference< XComponentCont
Reference< XStatusIndicator > xStatusIndicator;
lcl_extractAndStartStatusIndicator( _rResource, xStatusIndicator,
aFilterCreationArgs );
- uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
+uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
OUString sBaseURI = _rResource.getOrDefault("BaseURI", OUString());
if (sBaseURI.isEmpty())
sBaseURI = _rResource.getOrDefault("URL",OUString());
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index d422506307fa..bcb128145ffe 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -384,7 +384,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command&
aComman
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/commontools/DateConversion.cxx | 38
+-
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |2
connectivity/source/commontools/TPrivilegesResultSet.cxx |4 -
connectivity/source/commontools/dbtools2.cxx |2
connectivity/source/commontools/parameters.cxx |2
connectivity/source/cpool/ZConnectionPool.cxx |4 -
connectivity/source/cpool/ZPoolCollection.cxx |4 -
connectivity/source/cpool/ZPooledConnection.cxx|2
connectivity/source/drivers/component/CResultSet.cxx |4 -
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx|2
connectivity/source/drivers/dbase/DResultSet.cxx |4 -
connectivity/source/drivers/evoab2/NConnection.cxx | 36 -
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |2
connectivity/source/drivers/evoab2/NDriver.cxx |4 -
connectivity/source/drivers/evoab2/NResultSet.cxx |4 -
connectivity/source/drivers/evoab2/NResultSetMetaData.cxx |2
connectivity/source/drivers/evoab2/NTables.cxx |4 -
connectivity/source/drivers/file/FCatalog.cxx |2
connectivity/source/drivers/file/FPreparedStatement.cxx|6 -
connectivity/source/drivers/firebird/Connection.cxx|4 -
connectivity/source/drivers/flat/EDriver.cxx |4 -
connectivity/source/drivers/flat/EResultSet.cxx|9 +-
connectivity/source/drivers/hsqldb/HTables.cxx |2
connectivity/source/drivers/hsqldb/HViews.cxx |2
connectivity/source/drivers/jdbc/JConnection.cxx |2
connectivity/source/drivers/jdbc/Timestamp.cxx |2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx |4 -
connectivity/source/drivers/mork/MResultSet.cxx| 12 +--
connectivity/source/drivers/mork/MTables.cxx |2
connectivity/source/drivers/odbc/OResultSet.cxx|2
connectivity/source/drivers/postgresql/pq_statics.cxx |2
connectivity/source/drivers/postgresql/pq_xcolumns.cxx |2
connectivity/source/sdbcx/VUser.cxx|2
33 files changed, 89 insertions(+), 90 deletions(-)
New commits:
commit b45289e48e0f354b9996e2846dd041db4a9947ce
Author: Noel Grandin
AuthorDate: Fri Feb 8 13:13:08 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 13:39:29 2019 +0100
loplugin:indentation in connectivity
Change-Id: I6619fcdd84a23aae975dcaa7315c7f229c63c4f1
Reviewed-on: https://gerrit.libreoffice.org/67535
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/commontools/DateConversion.cxx
b/connectivity/source/commontools/DateConversion.cxx
index 95c3c0b2212d..510736cc6a3f 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -116,16 +116,16 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType,
const Any& _rVal,
if (_rVal.getValueType().getTypeClass() ==
css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
- _rVal >>= nValue;
- aDateTime = DBTypeConversion::toDateTime(nValue);
- bOk = true;
+_rVal >>= nValue;
+aDateTime = DBTypeConversion::toDateTime(nValue);
+bOk = true;
}
else if (_rVal.getValueType().getTypeClass() ==
css::uno::TypeClass_STRING)
{
OUString sValue;
- _rVal >>= sValue;
- aDateTime = DBTypeConversion::toDateTime(sValue);
- bOk = true;
+_rVal >>= sValue;
+aDateTime = DBTypeConversion::toDateTime(sValue);
+bOk = true;
}
else
bOk = _rVal >>= aDateTime;
@@ -148,16 +148,16 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType,
const Any& _rVal,
if (_rVal.getValueType().getTypeClass() ==
css::uno::TypeClass_DOUBLE)
{
double nValue = 0.0;
- _rVal >>= nValue;
- aDate = DBTypeConversion::toDate(nValue);
- bOk = true;
+_rVal >>= nValue;
+aDate = DBTypeConversion::toDate(nValue);
+bOk = true;
}
else if (_rVal.getValueType().getTypeClass() ==
css::uno::TypeClass_STRING)
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/css loleaflet/images
loleaflet/css/toolbar.css|2 +-
loleaflet/images/lc_basicshapes.cube.svg |7 +--
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit dd22e2208e2b7600ad64e4c4544097a9d23e9eaa
Author: Henry Castro
AuthorDate: Fri Feb 8 08:24:28 2019 -0400
Commit: Henry Castro
CommitDate: Fri Feb 8 08:40:32 2019 -0400
loleaflet: update basic shape cube icon
Change-Id: I5b3edd8245ef24039857f9a5a988003c15f50c49
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 93d9f9215..2e52c04ed 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -322,7 +322,7 @@ button.leaflet-control-search-next
.w2ui-icon.basicshapes_ring { background:
url('images/lc_basicshapes.ring.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_block-arc { background:
url('images/lc_basicshapes.block-arc.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_can { background: url('images/lc_basicshapes.can.svg')
no-repeat center !important; }
-.w2ui-icon.basicshapes_cube { background: url('images/lc_cube.svg') no-repeat
center !important; }
+.w2ui-icon.basicshapes_cube { background:
url('images/lc_basicshapes.cube.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_paper { background:
url('images/lc_basicshapes.paper.svg') no-repeat center !important; }
.w2ui-icon.basicshapes_frame { background: url('images/lc_rect_unfilled.svg')
no-repeat center !important; }
diff --git a/loleaflet/images/lc_basicshapes.cube.svg
b/loleaflet/images/lc_basicshapes.cube.svg
index e754b185a..36317ef15 100644
--- a/loleaflet/images/lc_basicshapes.cube.svg
+++ b/loleaflet/images/lc_basicshapes.cube.svg
@@ -1,6 +1 @@
-http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
-
-
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/qa editeng/source embeddedobj/source emfio/source eventattacher/source extensions/source
editeng/qa/unit/core-test.cxx |2
editeng/source/accessibility/AccessibleContextBase.cxx |8 +--
editeng/source/editeng/editeng.cxx |2
editeng/source/editeng/editview.cxx|2
editeng/source/editeng/impedit2.cxx|4 -
editeng/source/editeng/impedit3.cxx|2
editeng/source/items/numitem.cxx | 42 -
editeng/source/misc/SvXMLAutoCorrectImport.cxx |2
editeng/source/outliner/outliner.cxx | 26 +-
editeng/source/xml/xmltxtexp.cxx |2
editeng/source/xml/xmltxtimp.cxx |2
embeddedobj/source/commonembedding/embedobj.cxx|2
embeddedobj/source/msole/olemisc.cxx |4 -
embeddedobj/source/msole/olepersist.cxx|8 +--
emfio/source/reader/emfreader.cxx |4 -
emfio/source/reader/wmfreader.cxx |4 -
eventattacher/source/eventattacher.cxx |2
extensions/source/abpilot/datasourcehandling.cxx | 12 ++--
extensions/source/propctrlr/propcontroller.cxx |2
extensions/source/scanner/sane.cxx |4 -
20 files changed, 68 insertions(+), 68 deletions(-)
New commits:
commit 485e238bd10d1921b1b3ad7001cbe1949ca10bca
Author: Noel Grandin
AuthorDate: Fri Feb 8 13:15:15 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Feb 8 14:37:05 2019 +0100
loplugin:indentation in editeng..extensions
Change-Id: If7d7c400fb5d24e48b6cd02b364a8ac7fa23505d
Reviewed-on: https://gerrit.libreoffice.org/67538
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 6d600b462f39..1b8c079b58ba 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -437,7 +437,7 @@ private:
//before the two letters
void Test::testAutocorrect()
{
- SvxAutoCorrect aAutoCorrect((OUString()), (OUString()));
+SvxAutoCorrect aAutoCorrect((OUString()), (OUString()));
{
OUString sInput("TEst-TEst");
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx
b/editeng/source/accessibility/AccessibleContextBase.cxx
index b34b26f35ee7..1744514a4e4b 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -229,11 +229,11 @@ sal_Int32 SAL_CALL
}
}
}
- }
+}
- // Return -1 to indicate that this object's parent does not know about the
- // object.
- return -1;
+// Return -1 to indicate that this object's parent does not know about
the
+// object.
+return -1;
}
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index c67df5641d65..9925a39ecf74 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1442,7 +1442,7 @@ sal_uInt32 EditEngine::CalcTextWidth()
pImpEditEngine->FormatDoc();
sal_uInt32 nWidth = !IsVertical() ? pImpEditEngine->CalcTextWidth( true )
: pImpEditEngine->GetTextHeight();
- return nWidth;
+return nWidth;
}
void EditEngine::SetUpdateMode( bool bUpdate )
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 3df5480422e8..713028a67d0b 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -106,7 +106,7 @@ LanguageType EditView::CheckLanguage(
}
else// check single word
{
-if (!xSpell.is())
+if (!xSpell.is())
return nLang;
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index e4f50f410f74..5304855c4aa6 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1173,7 +1173,7 @@ EditPaM ImpEditEngine::CursorLeft( const EditPaM& rPaM,
sal_uInt16 nCharacterIte
{
sal_Int32 nCount = 1;
uno::Reference < i18n::XBreakIterator > _xBI( ImplGetBreakIterator() );
- aNewPaM.SetIndex(
+aNewPaM.SetIndex(
_xBI->previousCharacters(
aNewPaM.GetNode()->GetString(), aNewPaM.GetIndex(),
GetLocale( aNewPaM ), nCharacterIteratorMode, nCount, nCount));
}
@@ -3739,7 +3739,7 @@ sal_Int32 ImpEditEngine::GetChar(
long nXRight = nXLeft + rPortion.GetSize().Width();
if ( ( nXLeft <= nXPos ) && ( nXRight >= nXPos ) )
{
- nChar = nCurIndex;
+nChar = nCurIndex;
// Search within Portion...
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index e4a37a0f696e..61ccea0dda9e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2351,7 +2351,7 @@ sal_I
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - scripting/source
scripting/source/pyprov/pythonscript.py | 30 --
1 file changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 3ab1cef64f9becfbfb9935b01cfa3f8d2dbb272a
Author: Caolán McNamara
AuthorDate: Thu Oct 18 20:39:23 2018 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 8 14:38:10 2019 +0100
keep pyuno script processing below base uri
Reviewed-on: https://gerrit.libreoffice.org/62173
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
Conflicts:
scripting/source/pyprov/pythonscript.py
Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
diff --git a/scripting/source/pyprov/pythonscript.py
b/scripting/source/pyprov/pythonscript.py
index 6732e256fead..c43d892717d7 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -23,6 +23,7 @@ import os
import imp
import time
import ast
+from com.sun.star.uri.RelativeUriExcessParentSegments import RETAIN
try:
unicode
@@ -210,8 +211,33 @@ class MyUriHelper:
def scriptURI2StorageUri( self, scriptURI ):
try:
-myUri = self.m_uriRefFac.parse(scriptURI)
-ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
+# base path to the python script location
+sBaseUri = self.m_baseUri + "/"
+xBaseUri = self.m_uriRefFac.parse(sBaseUri)
+
+# path to the .py file + "$functionname, arguments, etc
+xStorageUri = self.m_uriRefFac.parse(scriptURI)
+sStorageUri = xStorageUri.getName().replace( "|", "/" );
+
+# path to the .py file, relative to the base
+sFileUri = sStorageUri[0:sStorageUri.find("$")]
+xFileUri = self.m_uriRefFac.parse(sFileUri)
+if not xFileUri:
+message = "pythonscript: invalid relative uri '" + sFileUri+
"'"
+log.debug( message )
+raise RuntimeException( message )
+
+# absolute path to the .py file
+xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri,
True, RETAIN)
+sAbsScriptUri = xAbsScriptUri.getUriReference()
+
+# ensure py file is under the base path
+if not sAbsScriptUri.startswith(sBaseUri):
+message = "pythonscript: storage uri '" + sAbsScriptUri + "'
not in base uri '" + self.m_baseUri + "'"
+log.debug( message )
+raise RuntimeException( message )
+
+ret = sBaseUri + sStorageUri
log.debug( "converting scriptURI="+scriptURI + " to storageURI=" +
ret )
return ret
except UnoException as e:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/DocumentBroker.hpp
wsd/DocumentBroker.hpp |1 - 1 file changed, 1 deletion(-) New commits: commit 214fb20e7f6b2fc34d24c3d53fc696044f8694e6 Author: Tor Lillqvist AuthorDate: Fri Feb 8 15:38:36 2019 +0200 Commit: Tor Lillqvist CommitDate: Fri Feb 8 15:38:40 2019 +0200 There is no DocumentBroker::handleDialogRequest() Change-Id: Ide3f00e898dd1d3dfde62f1eea1728beb6067b04 diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index 3d47c722d..75fc05dc4 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -306,7 +306,6 @@ public: void invalidateTiles(const std::string& tiles); void handleTileRequest(TileDesc& tile, const std::shared_ptr& session); -void handleDialogRequest(const std::string& dialogCmd); void handleTileCombinedRequest(TileCombined& tileCombined, const std::shared_ptr& session); void sendRequestedTiles(const std::shared_ptr& session); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
how to create and fill a table of contents ?
Hello, I'm looking for a code example to create a table of contents and fill it programmatically. I thought find something like an object called XTableOfContents in the unoil library, but nothing and Google didn't really help me. So, please if you some pointers, code examples, or advices they will be welcome. Best Regards, -- Vincent LORENZO 01-69-08-17-24 CEA Saclay Nano-INNOV Institut CARNOT CEA LIST Point Courrier n° 174 91 191 Gif sur Yvette CEDEX ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/uiconfig
sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui|4 ++-- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 49021f15cfb1dfb43dde73492df289f64a79297d Author: andreas kainz AuthorDate: Wed Jan 23 20:34:27 2019 +0100 Commit: andreas_kainz CommitDate: Fri Feb 8 14:44:35 2019 +0100 NB: add print to grouped_compact file drop down menu Change-Id: I8e6eab164ee864eb56d2ba7184a5587a18d5353a Reviewed-on: https://gerrit.libreoffice.org/67130 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 37f7b39ed05c5789d8c09768354e89ba0eb18c57) Reviewed-on: https://gerrit.libreoffice.org/67223 diff --git a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui index 150d0e103813..9eb7f06c8f94 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui @@ -767,10 +767,10 @@ - + True False -.uno:PrintPreview +.uno:Print diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 6771dd62ca99..8d985a9dc092 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -767,10 +767,10 @@ - + True False -.uno:PrintPreview +.uno:Print ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg
icon-themes/sifr/avmedia/res/avaudiologo.png |binary icon-themes/sifr/avmedia/res/avemptylogo.png |binary icon-themes/sifr/formula/res/refinp1.png |binary icon-themes/sifr/formula/res/refinp2.png |binary icon-themes/sifr_dark/avmedia/res/avaudiologo.png |binary icon-themes/sifr_dark/avmedia/res/avemptylogo.png |binary icon-themes/sifr_dark/formula/res/refinp1.png |binary icon-themes/sifr_dark/formula/res/refinp2.png |binary icon-themes/sifr_svg/avmedia/res/avaudiologo.svg | 10 ++ icon-themes/sifr_svg/avmedia/res/avemptylogo.svg | 10 ++ icon-themes/sifr_svg/formula/res/refinp1.svg | 10 +++--- icon-themes/sifr_svg/formula/res/refinp2.svg | 10 +++--- 12 files changed, 26 insertions(+), 14 deletions(-) New commits: commit e426cdc9e4af2d681b2bb0be290a3270df1886c6 Author: andreas kainz AuthorDate: Wed Feb 6 00:25:01 2019 +0100 Commit: andreas_kainz CommitDate: Fri Feb 8 14:44:51 2019 +0100 Sifr icon: update icon theme Change-Id: Id432035aba9ea443a1f4afcd54e39a8f3b0939cf Reviewed-on: https://gerrit.libreoffice.org/67543 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/sifr/avmedia/res/avaudiologo.png b/icon-themes/sifr/avmedia/res/avaudiologo.png new file mode 100644 index ..35875c32c96c Binary files /dev/null and b/icon-themes/sifr/avmedia/res/avaudiologo.png differ diff --git a/icon-themes/sifr/avmedia/res/avemptylogo.png b/icon-themes/sifr/avmedia/res/avemptylogo.png new file mode 100644 index ..7981515ccc14 Binary files /dev/null and b/icon-themes/sifr/avmedia/res/avemptylogo.png differ diff --git a/icon-themes/sifr/formula/res/refinp1.png b/icon-themes/sifr/formula/res/refinp1.png index 4acd5bf50335..844ee5268291 100644 Binary files a/icon-themes/sifr/formula/res/refinp1.png and b/icon-themes/sifr/formula/res/refinp1.png differ diff --git a/icon-themes/sifr/formula/res/refinp2.png b/icon-themes/sifr/formula/res/refinp2.png index 0d38e712b6a2..3dc67ee04858 100644 Binary files a/icon-themes/sifr/formula/res/refinp2.png and b/icon-themes/sifr/formula/res/refinp2.png differ diff --git a/icon-themes/sifr_dark/avmedia/res/avaudiologo.png b/icon-themes/sifr_dark/avmedia/res/avaudiologo.png new file mode 100644 index ..fa8c76e0dc72 Binary files /dev/null and b/icon-themes/sifr_dark/avmedia/res/avaudiologo.png differ diff --git a/icon-themes/sifr_dark/avmedia/res/avemptylogo.png b/icon-themes/sifr_dark/avmedia/res/avemptylogo.png new file mode 100644 index ..57905373e574 Binary files /dev/null and b/icon-themes/sifr_dark/avmedia/res/avemptylogo.png differ diff --git a/icon-themes/sifr_dark/formula/res/refinp1.png b/icon-themes/sifr_dark/formula/res/refinp1.png index fe2d9e29b41e..0af70b2d45c6 100644 Binary files a/icon-themes/sifr_dark/formula/res/refinp1.png and b/icon-themes/sifr_dark/formula/res/refinp1.png differ diff --git a/icon-themes/sifr_dark/formula/res/refinp2.png b/icon-themes/sifr_dark/formula/res/refinp2.png index 8f13a0a924ea..de99fe2ce157 100644 Binary files a/icon-themes/sifr_dark/formula/res/refinp2.png and b/icon-themes/sifr_dark/formula/res/refinp2.png differ diff --git a/icon-themes/sifr_svg/avmedia/res/avaudiologo.svg b/icon-themes/sifr_svg/avmedia/res/avaudiologo.svg new file mode 100644 index ..76c0a79e4f29 --- /dev/null +++ b/icon-themes/sifr_svg/avmedia/res/avaudiologo.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg"; viewBox="0 0 140 120"> + + + diff --git a/icon-themes/sifr_svg/avmedia/res/avemptylogo.svg b/icon-themes/sifr_svg/avmedia/res/avemptylogo.svg new file mode 100644 index ..b05ee4b1c900 --- /dev/null +++ b/icon-themes/sifr_svg/avmedia/res/avemptylogo.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg"; viewBox="0 0 140 120"> + + + diff --git a/icon-themes/sifr_svg/formula/res/refinp1.svg b/icon-themes/sifr_svg/formula/res/refinp1.svg index 283893cd5c8c..a06cefc18403 100644 --- a/icon-themes/sifr_svg/formula/res/refinp1.svg +++ b/icon-themes/sifr_svg/formula/res/refinp1.svg @@ -1,10 +1,6 @@ http://www.w3.org/2000/svg"; viewBox="0 0 16 16"> - - - + diff --git a/icon-themes/sifr_svg/formula/res/refinp2.svg b/icon-themes/sifr_svg/formula/res/refinp2.svg index 0112f6c47a6b..05c1c0984f8d 100644 --- a/icon-themes/sifr_svg/formula/res/refinp2.svg +++ b/icon-themes/sifr_svg/formula/res/refinp2.svg @@ -1,10 +1,6 @@ http://www.w3.org/2000/svg"; viewBox="0 0 16 16"> - - - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/DocumentBroker.hpp
wsd/DocumentBroker.hpp |1 -
1 file changed, 1 deletion(-)
New commits:
commit fb29e3989916d27208d318097f21626a31403c8d
Author: Tor Lillqvist
AuthorDate: Fri Feb 8 15:47:35 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Feb 8 15:47:35 2019 +0200
There is no DocumentBroker::handleDialogPaintResponse() either
Change-Id: I84daa5da83b9d27c8bedadeb8a5d660573e00eb4
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 75fc05dc4..c9865a7eb 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -311,7 +311,6 @@ public:
void sendRequestedTiles(const std::shared_ptr& session);
void cancelTileRequests(const std::shared_ptr& session);
void handleTileResponse(const std::vector& payload);
-void handleDialogPaintResponse(const std::vector& payload, bool
child);
void handleTileCombinedResponse(const std::vector& payload);
bool isMarkedToDestroy() const { return _markToDestroy || _stop; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/toolbar.css |2 +-
loleaflet/images/lc_signature.svg | 17 +
loleaflet/images/sc_signature.svg |4
3 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 82d544b8b197f88f32c717a1da38812261a3c872
Author: Henry Castro
AuthorDate: Fri Feb 8 09:52:16 2019 -0400
Commit: Henry Castro
CommitDate: Fri Feb 8 09:58:35 2019 -0400
loleaflet: update shape signature icon
Change-Id: I1553bd792630a5c6040fa259cb47c04f0c2654a9
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 2e52c04ed..33f9c3a99 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -387,7 +387,7 @@ button.leaflet-control-search-next
.w2ui-icon.starshapes_concave-star6 { background:
url('images/lc_starshapes.concave-star6.svg') no-repeat center !important; }
.w2ui-icon.starshapes_vertical-scroll { background:
url('images/lc_starshapes.vertical-scroll.svg') no-repeat center !important; }
.w2ui-icon.starshapes_horizontal-scroll { background:
url('images/lc_starshapes.horizontal-scroll.svg') no-repeat center !important; }
-.w2ui-icon.starshapes_signet { background: url('images/sc_signature.svg')
no-repeat center !important; }
+.w2ui-icon.starshapes_signet { background: url('images/lc_signature.svg')
no-repeat center !important; }
.w2ui-icon.starshapes_doorplate { background:
url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
.w2ui-icon.calloutshapes_rectangular-callout { background:
url('images/lc_calloutshapes.rectangular-callout.svg') no-repeat center
!important; }
diff --git a/loleaflet/images/lc_signature.svg
b/loleaflet/images/lc_signature.svg
new file mode 100644
index 0..8c5501c30
--- /dev/null
+++ b/loleaflet/images/lc_signature.svg
@@ -0,0 +1,17 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
+
+
diff --git a/loleaflet/images/sc_signature.svg
b/loleaflet/images/sc_signature.svg
deleted file mode 100644
index 049527140..0
--- a/loleaflet/images/sc_signature.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-http://www.w3.org/2000/svg";>
-
- />
-
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/css loleaflet/images
loleaflet/css/toolbar.css |2 +-
loleaflet/images/lc_signature.svg | 17 +
loleaflet/images/sc_signature.svg |4
3 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit e6da0ac63c9751763ad1924aff75645b44d04171
Author: Henry Castro
AuthorDate: Fri Feb 8 09:52:16 2019 -0400
Commit: Henry Castro
CommitDate: Fri Feb 8 09:59:32 2019 -0400
loleaflet: update shape signature icon
Change-Id: I1553bd792630a5c6040fa259cb47c04f0c2654a9
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 2e52c04ed..33f9c3a99 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -387,7 +387,7 @@ button.leaflet-control-search-next
.w2ui-icon.starshapes_concave-star6 { background:
url('images/lc_starshapes.concave-star6.svg') no-repeat center !important; }
.w2ui-icon.starshapes_vertical-scroll { background:
url('images/lc_starshapes.vertical-scroll.svg') no-repeat center !important; }
.w2ui-icon.starshapes_horizontal-scroll { background:
url('images/lc_starshapes.horizontal-scroll.svg') no-repeat center !important; }
-.w2ui-icon.starshapes_signet { background: url('images/sc_signature.svg')
no-repeat center !important; }
+.w2ui-icon.starshapes_signet { background: url('images/lc_signature.svg')
no-repeat center !important; }
.w2ui-icon.starshapes_doorplate { background:
url('images/lc_starshapes.doorplate.svg') no-repeat center !important; }
.w2ui-icon.calloutshapes_rectangular-callout { background:
url('images/lc_calloutshapes.rectangular-callout.svg') no-repeat center
!important; }
diff --git a/loleaflet/images/lc_signature.svg
b/loleaflet/images/lc_signature.svg
new file mode 100644
index 0..8c5501c30
--- /dev/null
+++ b/loleaflet/images/lc_signature.svg
@@ -0,0 +1,17 @@
+http://www.w3.org/2000/svg";>
+
+
+
+
+
+
diff --git a/loleaflet/images/sc_signature.svg
b/loleaflet/images/sc_signature.svg
deleted file mode 100644
index 049527140..0
--- a/loleaflet/images/sc_signature.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-http://www.w3.org/2000/svg";>
-
- />
-
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/diagram/diagramlayoutatoms.cxx |4 ++
sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx |binary
sd/qa/unit/import-tests-smartart.cxx| 38
3 files changed, 42 insertions(+)
New commits:
commit b9b4e9223b6c0d6e0b48b694c9aabbe54a250660
Author: Miklos Vajna
AuthorDate: Fri Feb 8 14:27:05 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 8 15:36:10 2019 +0100
oox smartart, cycle matrix: handle left/bottom constraint in composite algo
The bugdoc has 3 shapes in the "outer" circle which have a position
where either x or y is not 0. But these are defined using constraints
talking about the right or bottom edge of the shape.
Map that to top/left, given that we already know the shape size.
Change-Id: If7ccc2fb642046eb53b48c8b2c2b2c6b023ba9e8
Reviewed-on: https://gerrit.libreoffice.org/67544
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 2b17bee2a65d..d6a02570f535 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -543,11 +543,15 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
aPos.X = it->second;
else if ( (it = rProp.find(XML_ctrX)) != rProp.end() )
aPos.X = it->second - aSize.Width/2;
+else if ((it = rProp.find(XML_r)) != rProp.end())
+aPos.X = it->second - aSize.Width;
if ( (it = rProp.find(XML_t)) != rProp.end())
aPos.Y = it->second;
else if ( (it = rProp.find(XML_ctrY)) != rProp.end() )
aPos.Y = it->second - aSize.Height/2;
+else if ((it = rProp.find(XML_b)) != rProp.end())
+aPos.Y = it->second - aSize.Height;
if ( (it = rProp.find(XML_l)) != rProp.end() && (it2 =
rProp.find(XML_r)) != rProp.end() )
aSize.Width = it2->second - it->second;
diff --git a/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx
b/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx
index 0815df945b6d..d154e7f64bc0 100644
Binary files a/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx and
b/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx
b/sd/qa/unit/import-tests-smartart.cxx
index 22eda8b7f74d..221f7390c5a3 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -832,6 +832,44 @@ void SdImportTestSmartArt::testCycleMatrix()
CPPUNIT_ASSERT(xA2.is());
CPPUNIT_ASSERT_EQUAL(OUString("A2"), xA2->getString());
+// Test that the layout of shapes is like this:
+// A2 B2
+// D2 C2
+
+uno::Reference xA2Shape(xA2, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xA2Shape.is());
+
+uno::Reference
xB2(getChildShape(getChildShape(getChildShape(xGroup, 0), 1), 1),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT(xB2.is());
+CPPUNIT_ASSERT_EQUAL(OUString("B2"), xB2->getString());
+uno::Reference xB2Shape(xB2, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xB2Shape.is());
+
+uno::Reference
xC2(getChildShape(getChildShape(getChildShape(xGroup, 0), 2), 1),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT(xC2.is());
+CPPUNIT_ASSERT_EQUAL(OUString("C2"), xC2->getString());
+uno::Reference xC2Shape(xC2, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xC2Shape.is());
+
+uno::Reference
xD2(getChildShape(getChildShape(getChildShape(xGroup, 0), 3), 1),
+uno::UNO_QUERY);
+CPPUNIT_ASSERT(xD2.is());
+CPPUNIT_ASSERT_EQUAL(OUString("D2"), xD2->getString());
+uno::Reference xD2Shape(xD2, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xD2Shape.is());
+
+// Without the accompanying fix in place, this test would have failed, i.e.
+// the A2 and B2 shapes had the same horizontal position, while B2 should
+// be on the right of A2.
+CPPUNIT_ASSERT_GREATER(xA2Shape->getPosition().X,
xB2Shape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(xA2Shape->getPosition().Y, xB2Shape->getPosition().Y);
+CPPUNIT_ASSERT_GREATER(xA2Shape->getPosition().X,
xC2Shape->getPosition().X);
+CPPUNIT_ASSERT_GREATER(xA2Shape->getPosition().Y,
xC2Shape->getPosition().Y);
+CPPUNIT_ASSERT_EQUAL(xA2Shape->getPosition().X, xD2Shape->getPosition().X);
+CPPUNIT_ASSERT_GREATER(xA2Shape->getPosition().Y,
xD2Shape->getPosition().Y);
+
xDocShRef->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/qa chart2/source sw/qa
chart2/qa/extras/chart2import.cxx | 20
chart2/qa/extras/data/ods/tdf108021.ods|binary
chart2/source/view/axes/VCartesianAxis.cxx | 19 ++-
sw/qa/extras/layout/data/tdf108021.odt |binary
sw/qa/extras/layout/layout.cxx | 20
5 files changed, 58 insertions(+), 1 deletion(-)
New commits:
commit 415dbafb2dcc5b9b897b5febaed66fc9431a6857
Author: Balazs Varga
AuthorDate: Fri Dec 14 14:38:49 2018 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 8 15:43:09 2019 +0100
tdf#108021 Chart: Fix text break of column chart X axis
With this patch the text break is allowed for column chart
X axis if the text is rotated with 0, 90 or 270 degree.
Also recalculate the nLimitedSpaceForText in case of 90
and 270 degree if the X axis label's text break is true.
(cherry-picked from commit: f8d6de19181d749d7c2b345ce7084c0c07fa3eab)
(cherry-picked from commit: 40ffaa4f23fe59f979222facf1688d25c60651b6)
Change-Id: I5d78be6ed83dd195bbc34185d5f6b7e44f555d9b
Reviewed-on: https://gerrit.libreoffice.org/66061
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index caf55b448b92..aa46fbae8503 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -69,6 +69,7 @@ public:
void testTdf86624(); // manually placed legends
void testTdf105517();
void testTdf106217();
+void testTdf108021();
void testAutoBackgroundXLSX();
void testChartAreaStyleBackgroundXLSX();
void testChartHatchFillXLSX();
@@ -148,6 +149,7 @@ public:
CPPUNIT_TEST(testTdf86624);
CPPUNIT_TEST(testTdf105517);
CPPUNIT_TEST(testTdf106217);
+CPPUNIT_TEST(testTdf108021);
CPPUNIT_TEST(testAutoBackgroundXLSX);
CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX);
CPPUNIT_TEST(testChartHatchFillXLSX);
@@ -847,6 +849,24 @@ void Chart2ImportTest::testTdf106217()
CPPUNIT_ASSERT_EQUAL(sal_Int32(2700), aSize.Height);
}
+void Chart2ImportTest::testTdf108021()
+{
+// Tdf108021 : To check TextBreak value is true.
+load("/chart2/qa/extras/data/ods/", "tdf108021.ods");
+uno::Reference< chart::XDiagram > mxDiagram;
+uno::Reference< beans::XPropertySet > xAxisProp;
+bool bTextBreak = false;
+uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW);
+mxDiagram.set(xChartDoc->getDiagram());
+CPPUNIT_ASSERT(mxDiagram.is());
+uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram,
uno::UNO_QUERY );
+CPPUNIT_ASSERT(xAxisXSupp.is());
+xAxisProp = xAxisXSupp->getXAxis();
+xAxisProp->getPropertyValue("TextBreak") >>= bTextBreak;
+// Expected value of 'TextBreak' is true
+CPPUNIT_ASSERT(bTextBreak);
+}
+
void Chart2ImportTest::testTransparentBackground(OUString const & filename)
{
load("/chart2/qa/extras/data/xlsx/", filename);
diff --git a/chart2/qa/extras/data/ods/tdf108021.ods
b/chart2/qa/extras/data/ods/tdf108021.ods
new file mode 100755
index ..ebbc5e56f24f
Binary files /dev/null and b/chart2/qa/extras/data/ods/tdf108021.ods differ
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 0b488abaa5e1..4db36271ce20 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -526,7 +526,9 @@ bool VCartesianAxis::isBreakOfLabelsAllowed(
//no break for value axis
if( !m_bUseTextLabels )
return false;
-if( rAxisLabelProperties.fRotationAngleDegree != 0.0 )
+if( !( rAxisLabelProperties.fRotationAngleDegree == 0.0 ||
+ rAxisLabelProperties.fRotationAngleDegree == 90.0 ||
+ rAxisLabelProperties.fRotationAngleDegree == 270.0 ) )
return false;
//break only for horizontal axis
return bIsHorizontalAxis;
@@ -730,6 +732,21 @@ bool VCartesianAxis::createTextShapes(
nReduce = 1;
nLimitedSpaceForText -= nReduce;
}
+
+// recalculate the nLimitedSpaceForText in case of 90 and 270 degree
if the text break is true
+if ( rAxisLabelProperties.fRotationAngleDegree == 90.0 ||
rAxisLabelProperties.fRotationAngleDegree == 270.0 )
+{
+if ( rAxisLabelProperties.m_aFontReferenceSize.Height -
rAxisLabelProperties.m_aMaximumSpaceForLabels.Height > 2 *
rAxisLabelProperties.m_aMaximumSpaceForLabels.Y )
+{
+const sal_Int32 nFullHeight =
rAxisLabelProperties.m_aFontReferenceSize.Height;
+sal_Int32 nMaxLabelsHeight = nFullHeight - (
rAxisLabelProperties.m_aMaximumSpaceForLabels.Height +
rAxisLabelProperties.m_aMaximumSpaceForLabels.Y );
+nLimitedSpaceForText = nMaxLabelsHeight;
+}
+else
+{
+nLimitedSpaceForText =
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/qa oox/inc oox/source
chart2/qa/extras/chart2import.cxx | 21 +
chart2/qa/extras/data/xlsx/chart_label_text_break.xlsx |binary
oox/inc/drawingml/chart/objectformatter.hxx|5
oox/source/drawingml/chart/axisconverter.cxx |4 +--
oox/source/drawingml/chart/objectformatter.cxx | 20
5 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit 997a1ae35041dc8eba5ba7c4e7e3552632ea08d4
Author: Balazs Varga
AuthorDate: Fri Jan 4 15:12:38 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 8 15:42:33 2019 +0100
tdf#122091 OOXML Import: Automatically break of X Axis labels
Set the TextBreak value automatically true, only if the X axis labels
rotation is 0 degree. The MS Office using a similar method because
there is no any XML tag in the OOXML standard which refer to this setting.
Change-Id: Ie84a95935f0d5c4c1f9a30803e22572141385960
Reviewed-on: https://gerrit.libreoffice.org/65853
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
(cherry picked from commit 015569fc919b702f7a1b0f09038bafa9f104ca70)
Reviewed-on: https://gerrit.libreoffice.org/65934
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index c85bcc67c06a..caf55b448b92 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -74,6 +74,7 @@ public:
void testChartHatchFillXLSX();
void testAxisTextRotationXLSX();
// void testTextCanOverlapXLSX(); // TODO : temporarily disabled.
+void testTextBreakXLSX();
void testNumberFormatsXLSX();
void testTransparentBackground(OUString const & filename);
@@ -152,6 +153,7 @@ public:
CPPUNIT_TEST(testChartHatchFillXLSX);
CPPUNIT_TEST(testAxisTextRotationXLSX);
// CPPUNIT_TEST(testTextCanOverlapXLSX); // TODO : temporarily disabled.
+CPPUNIT_TEST(testTextBreakXLSX);
CPPUNIT_TEST(testNumberFormatsXLSX);
CPPUNIT_TEST(testAutoTitleDelDefaultValue2007XLSX);
CPPUNIT_TEST(testAutoTitleDelDefaultValue2013XLSX);
@@ -985,6 +987,25 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
}
*/
+void Chart2ImportTest::testTextBreakXLSX()
+{
+// tdf#122091: To check textbreak value is true in case of 0° degree of
Axis label rotation.
+load("/chart2/qa/extras/data/xlsx/", "chart_label_text_break.xlsx");
+uno::Reference< chart::XDiagram > mxDiagram;
+uno::Reference< beans::XPropertySet > xAxisProp;
+bool textBreak = false;
+uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, mxComponent ), UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xChartDoc.is());
+mxDiagram.set(xChartDoc->getDiagram());
+CPPUNIT_ASSERT(mxDiagram.is());
+uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram,
uno::UNO_QUERY );
+CPPUNIT_ASSERT(xAxisXSupp.is());
+xAxisProp = xAxisXSupp->getXAxis();
+xAxisProp->getPropertyValue("TextBreak") >>= textBreak;
+// Expected value of 'TextBreak' is true
+CPPUNIT_ASSERT(textBreak);
+}
+
void Chart2ImportTest::testNumberFormatsXLSX()
{
load("/chart2/qa/extras/data/xlsx/", "number-formats.xlsx");
diff --git a/chart2/qa/extras/data/xlsx/chart_label_text_break.xlsx
b/chart2/qa/extras/data/xlsx/chart_label_text_break.xlsx
new file mode 100755
index ..81c4958604d5
Binary files /dev/null and
b/chart2/qa/extras/data/xlsx/chart_label_text_break.xlsx differ
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx
b/oox/inc/drawingml/chart/objectformatter.hxx
index 446c3d899293..8282844b1ab3 100644
--- a/oox/inc/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/drawingml/chart/objectformatter.hxx
@@ -144,6 +144,11 @@ public:
/** Returns true, if the passed shape properties have automatic fill mode.
*/
static bool isAutomaticFill( const ModelRef< Shape >& rxShapeProp
);
+/** Returns true, if the X Axis label rotation is 0 degree. */
+static bool getTextRotation(
+const ModelRef< TextBody >& rxTextProp,
+sal_Int32 nDefaultRotation = 0 );
+
private:
std::shared_ptr< ObjectFormatterData > mxData;
};
diff --git a/oox/source/drawingml/chart/axisconverter.cxx
b/oox/source/drawingml/chart/axisconverter.cxx
index 7bcba408ffbb..f35cd5333e70 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -260,8 +260,8 @@ void AxisConverter::convertFromModel(
{
// do not overlap text unless all labels are visible
aAxisProp.setProperty( PROP_TextOverlap,
mrModel.mnTickLabelSkip == 1 );
-// do not break text into several lines
-aAxisProp.setProperty( PROP_TextBreak, false );
+// do not break text into several lines unless the
rotation is 0 degree
+aAxisProp.setProperty( PROP_TextBreak,
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/core/edit/edredln.cxx |5 -
sw/source/uibase/shells/textfld.cxx |5 -
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit ada64926dd025a0047d11cd7519f5268f4399ce9
Author: László Németh
AuthorDate: Thu Jan 31 14:27:06 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 8 15:44:38 2019 +0100
tdf#79197 enable comment of a selected change
with cursor position at the end of the change,
ie. now using "Next Track Change" not only
select the next track change, but it enables
the icon "Insert Track Change Comment" and the
menu item "Edit->Track Changes->Comment...",
and it's possible to add comments as expected.
Change-Id: I21318e70614d1285dd6fd90d8a7cc707fc0b5757
Reviewed-on: https://gerrit.libreoffice.org/67216
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 9cb5b06eea8f0067bb9ddee9f4f1c992eda34a64)
Reviewed-on: https://gerrit.libreoffice.org/67235
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index e99aa5c36ae3..a78a54ec1698 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -120,7 +120,10 @@ bool SwEditShell::SetRedlineComment( const OUString& rS )
const SwRangeRedline* SwEditShell::GetCurrRedline() const
{
-return GetDoc()->getIDocumentRedlineAccess().GetRedline(
*GetCursor()->GetPoint(), nullptr );
+if (const SwRangeRedline* pRed =
GetDoc()->getIDocumentRedlineAccess().GetRedline( *GetCursor()->GetPoint(),
nullptr ))
+return pRed;
+// check the other side of the selection to handle completely selected
changes, where the Point is at the end
+return GetDoc()->getIDocumentRedlineAccess().GetRedline(
*GetCursor()->GetMark(), nullptr );
}
void SwEditShell::UpdateRedlineAttr()
diff --git a/sw/source/uibase/shells/textfld.cxx
b/sw/source/uibase/shells/textfld.cxx
index d0861d7ab6ae..68c49f0f2d7c 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -567,7 +567,10 @@ void SwTextShell::ExecField(SfxRequest &rReq)
rSh.EndAction();
rSh.ClearMark();
-rSh.SelNextRedline(); // Select current redline.
+// Select current redline.
+pActRed = rSh.SelNextRedline();
+if (pActRed != pRedline)
+rSh.SelPrevRedline();
rSh.StartAction();
rSh.Push();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - dtrans/source
dtrans/source/win32/clipb/MtaOleClipb.cxx | 102 ++
dtrans/source/win32/clipb/MtaOleClipb.hxx |1
2 files changed, 90 insertions(+), 13 deletions(-)
New commits:
commit 9d7baded9f315096f247af15a23fd899fc4facc3
Author: Mike Kaganski
AuthorDate: Mon Feb 4 23:12:42 2019 +0300
Commit: Miklos Vajna
CommitDate: Fri Feb 8 15:45:44 2019 +0100
tdf#122435: reimplement fix for tdf#109085
This reverts commit 3d8c159841bcab7365b2bed3df71ed3c15188312, and
instead, checks if the MtaOleReq window is not destroyed yet, in
addition to the wait for the condition. This allows to avoid wait
forever for condition which never gets signalled, and process the
sent messages when waiting.
The window's WM_DESTROY handler sets the event signalling that.
The Win32Condition's wait() is changed to take the abort event,
and return true if its own event fired, and false if abort event
fired.
Change-Id: I1861dd3dabb39329976a3ccf2a5392c9ddbf9613
Reviewed-on: https://gerrit.libreoffice.org/67383
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 11a2809e369b2a6fcbb2d7f0db131a945557c6e2)
Reviewed-on: https://gerrit.libreoffice.org/67389
Tested-by: Xisco Faulí
Reviewed-by: Miklos Vajna
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx
b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index d935713b8e43..828e9fd01640 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -63,11 +63,72 @@ namespace /* private */
const sal_uInt32 MAX_WAIT_SHUTDOWN = 1; // msec
const sal_uInt32 MAX_CLIPEVENT_PROCESSING_TIME = 5000; // msec
-const bool MANUAL_RESET = true;
-const bool INIT_NONSIGNALED = false;
+const BOOL MANUAL_RESET = TRUE;
+const BOOL INIT_NONSIGNALED = FALSE;
+
+/* Cannot use osl conditions because they are blocking
+without waking up on messages sent by another thread
+this leads to deadlocks because we are blocking the
+communication between inter-thread marshalled COM
+pointers.
+COM Proxy-Stub communication uses SendMessages for
+synchronization purposes.
+*/
+class Win32Condition
+{
+public:
+Win32Condition() = default;
+
+~Win32Condition() { CloseHandle(m_hEvent); }
+
+// wait infinite for own event (or abort event) be signaled
+// leave messages sent through
+bool wait(HANDLE hEvtAbort)
+{
+const HANDLE hWaitArray[2] = { m_hEvent, hEvtAbort };
+while (true)
+{
+DWORD dwResult
+= MsgWaitForMultipleObjects(2, hWaitArray, FALSE,
INFINITE, QS_SENDMESSAGE);
+
+switch (dwResult)
+{
+case WAIT_OBJECT_0: // wait successful
+return true;
+
+case WAIT_OBJECT_0 + 1: // wait aborted
+return false;
+
+case WAIT_OBJECT_0 + 2:
+{
+/* PeekMessage processes all messages in the
SendMessage
+ queue that's what we want, messages from the
PostMessage
+ queue stay untouched */
+MSG msg;
+PeekMessageW(&msg, nullptr, 0, 0, PM_NOREMOVE);
+
+break;
+}
+}
+}
+}
+
+// set the event
+void set() { SetEvent(m_hEvent); }
+
+private:
+HANDLE m_hEvent = CreateEventW(nullptr, MANUAL_RESET,
INIT_NONSIGNALED, nullptr);
+
+// prevent copy/assignment
+Win32Condition(const Win32Condition&) = delete;
+Win32Condition& operator=(const Win32Condition&) = delete;
+};
+
+// we use one condition for every request
struct MsgCtx
{
+Win32Condition aCondition;
HRESULT hr;
};
@@ -160,6 +221,8 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
m_uOleThreadId( 0 ),
m_hEvtThrdReady( nullptr ),
m_hwndMtaOleReqWnd( nullptr ),
+// signals that the window is destroyed - to stop waiting any winproc
result
+m_hEvtWndDisposed(CreateEventW(nullptr, MANUAL_RESET, INIT_NONSIGNALED,
nullptr)),
m_MtaOleReqWndClassAtom( 0 ),
m_pfncClipViewerCallback( nullptr ),
m_bRunClipboardNotifierThread( true ),
@@ -171,6 +234,7 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
m_hEvtThrdReady = CreateEventW( nullptr, MANUAL_RESET, INIT_NONSIGNALED,
nullptr );
OSL_ASSERT( nullptr != m_hEvtThrdReady );
+SAL_WARN_IF(!m_hEvtWndDisposed, "dtrans", "CreateEventW failed:
m_hEvtWndDisposed is nullptr");
s_theMtaOleClipboardInst = this;
@@ -254,11 +318,10 @@ HRESULT CMtaOleClipboard::flushClipboard( )
MsgCtx aMsgCtx;
-send
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svx/source
svx/source/fmcomp/gridctrl.cxx | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 106e7acab6e31e1e0cee40716335f2b758d6186b
Author: Caolán McNamara
AuthorDate: Wed Feb 6 14:27:25 2019 +
Commit: Miklos Vajna
CommitDate: Fri Feb 8 15:47:56 2019 +0100
tdf#115941 use same font statusbar does for form navigator bar
now that we have it the same height as a statusbar
Change-Id: I0d5ee3f8dc57e94be5d45581bc4382e3448353c3
Reviewed-on: https://gerrit.libreoffice.org/67462
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 9a923e1ce53753bb8538054fd1658a67ca0ff354)
Reviewed-on: https://gerrit.libreoffice.org/67487
Reviewed-by: Miklos Vajna
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 997250cf8ea9..ea37f509f0af 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -434,14 +434,9 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
sal_uInt16 nX = 1;
sal_uInt16 nY = 0;
-// Is the font of this edit larger than the field?
-if (m_aAbsolute->GetTextHeight() > nH)
{
-vcl::Font aApplFont (m_aAbsolute->GetFont());
-const Size pointAbsoluteSize(m_aAbsolute->PixelToLogic( Size( 0, nH -
2 ), MapMode(MapUnit::MapPoint) ));
-aApplFont.SetFontSize( pointAbsoluteSize );
+vcl::Font aApplFont(GetSettings().GetStyleSettings().GetToolFont());
m_aAbsolute->SetControlFont( aApplFont );
-
aApplFont.SetTransparent( true );
m_aRecordText->SetControlFont( aApplFont );
m_aRecordOf->SetControlFont( aApplFont );
@@ -817,7 +812,7 @@ void
DbGridControl::NavigationBar::StateChanged(StateChangedType nType)
Fraction aZoom = GetZoom();
// not all of these controls need to know the new zoom, but to be
sure ...
-vcl::Font aFont(GetSettings().GetStyleSettings().GetFieldFont());
+vcl::Font aFont(GetSettings().GetStyleSettings().GetToolFont());
if (IsControlFont())
aFont.Merge(GetControlFont());
@@ -1115,7 +1110,7 @@ void DbGridControl::ImplInitWindow( const InitWindowFacet
_eInitWhat )
{
if ( m_bNavigationBar )
{
-vcl::Font aFont =
m_aBar->GetSettings().GetStyleSettings().GetFieldFont();
+vcl::Font aFont =
m_aBar->GetSettings().GetStyleSettings().GetToolFont();
if ( IsControlFont() )
m_aBar->SetControlFont( GetControlFont() );
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |5 +++--
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx |2 +-
bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx |3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 0c314c90a7af7d9e855e3cacfd8e7a31ed065a26
Author: Stephan Bergmann
AuthorDate: Fri Feb 8 10:10:30 2019 +0100
Commit: Stephan Bergmann
CommitDate: Fri Feb 8 16:02:38 2019 +0100
The gcc3_linux_aarch64 bridge needs to call __cxa_current_exception_type,
too
...or else mapException would extract garbage from the fake
exception->exceptionType std::type_info* when catching via
cppu::getCaughtException the rethrown exception thrown via
std::rethrow_exception in Test::testgetCaughtException in
cppuhelper/qa/misc/test_misc.cxx.
6ddecf61ecada646fbd6f8809270d47289727e8a "fillUnoException not working on
std::rethrow_exception exceptions" had adapted the other relevant
bridges/source/cpp_uno/gcc3_*/ cases but missed the gcc3_linux_aarch64 one.
Change-Id: I5a2afb11ad4abf851169bd3fd8ae647cc81c2fcd
Reviewed-on: https://gerrit.libreoffice.org/67542
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index da22eb436b8f..477879f2f2a0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -224,10 +224,11 @@ StructKind getStructKind(typelib_CompoundTypeDescription
const * type) {
namespace abi_aarch64 {
void mapException(
-__cxa_exception * exception, uno_Any * any, uno_Mapping * mapping)
+__cxa_exception * exception, std::type_info const * type, uno_Any * any,
uno_Mapping * mapping)
{
assert(exception != 0);
-OUString unoName(toUnoName(exception->exceptionType->name()));
+assert(type != nullptr);
+OUString unoName(toUnoName(type->name()));
typelib_TypeDescription * td = 0;
typelib_typedescription_getByName(&td, unoName.pData);
if (td == 0) {
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
index de9bd5efbccb..50c5f1f21a37 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
@@ -70,7 +70,7 @@ struct __cxa_eh_globals
};
void mapException(
-__cxa_exception * exception, uno_Any * any, uno_Mapping * mapping);
+__cxa_exception * exception, std::type_info const * type, uno_Any * any,
uno_Mapping * mapping);
void raiseException(uno_Any * any, uno_Mapping * mapping);
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
index 8faccbf3edaf..32a19de020b1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
@@ -192,7 +192,8 @@ void call(
abi_aarch64::mapException(
reinterpret_cast(
__cxxabiv1::__cxa_get_globals())->caughtExceptions,
-*exception, proxy->getBridge()->getCpp2Uno());
+__cxxabiv1::__cxa_current_exception_type(), *exception,
+proxy->getBridge()->getCpp2Uno());
for (sal_Int32 i = 0; i != count; ++i) {
if (cppArgs[i] != 0) {
uno_destructData(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - 2 commits - external/curl
external/curl/CVE-2018-14618.patch| 34 +
external/curl/CVE-2018-16890.patch| 30 +
external/curl/CVE-2019-3822.patch | 35 ++
external/curl/UnpackedTarball_curl.mk |3 ++
4 files changed, 102 insertions(+)
New commits:
commit 542c991e559ae0f6132b7fea10d995a6452215ba
Author: Michael Stahl
AuthorDate: Wed Feb 6 12:18:58 2019 +0100
Commit: Thorsten Behrens
CommitDate: Fri Feb 8 16:50:34 2019 +0100
curl: add patches for CVE-2018-16890 and CVE-2019-3822
The third one (CVE-2019-3823) isn't relevant because SMTP is disabled.
Reviewed-on: https://gerrit.libreoffice.org/67445
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit 9f755aed82154abe29c40899882b3a383aa6f475)
Change-Id: I2383c1a7b0c67c586402d4098092cee565edcdda
Reviewed-on: https://gerrit.libreoffice.org/67509
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/external/curl/CVE-2018-16890.patch
b/external/curl/CVE-2018-16890.patch
new file mode 100644
index ..3ba0b38b21a4
--- /dev/null
+++ b/external/curl/CVE-2018-16890.patch
@@ -0,0 +1,30 @@
+From b780b30d1377adb10bbe774835f49e9b237fb9bb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Wed, 2 Jan 2019 20:33:08 +0100
+Subject: [PATCH] NTLM: fix size check condition for type2 received data
+
+Bug: https://curl.haxx.se/docs/CVE-2018-16890.html
+Reported-by: Wenxiang Qian
+CVE-2018-16890
+---
+ lib/vauth/ntlm.c | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
+index c3d55ed251..0ad4d972e3 100644
+--- a/lib/vauth/ntlm.c
b/lib/vauth/ntlm.c
+@@ -182,10 +182,11 @@ static CURLcode ntlm_decode_type2_target(struct
Curl_easy *data,
+ target_info_len = Curl_read16_le(&buffer[40]);
+ target_info_offset = Curl_read32_le(&buffer[44]);
+ if(target_info_len > 0) {
+- if(((target_info_offset + target_info_len) > size) ||
++ if((target_info_offset >= size) ||
++ ((target_info_offset + target_info_len) > size) ||
+ (target_info_offset < 48)) {
+ infof(data, "NTLM handshake failure (bad type-2 message). "
+-"Target Info Offset Len is set incorrect by the peer\n");
++ "Target Info Offset Len is set incorrect by the peer\n");
+ return CURLE_BAD_CONTENT_ENCODING;
+ }
+
diff --git a/external/curl/CVE-2019-3822.patch
b/external/curl/CVE-2019-3822.patch
new file mode 100644
index ..938926b1d331
--- /dev/null
+++ b/external/curl/CVE-2019-3822.patch
@@ -0,0 +1,35 @@
+From 50c9484278c63b958655a717844f0721263939cc Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Thu, 3 Jan 2019 12:59:28 +0100
+Subject: [PATCH] ntlm: fix *_type3_message size check to avoid buffer overflow
+
+Bug: https://curl.haxx.se/docs/CVE-2019-3822.html
+Reported-by: Wenxiang Qian
+CVE-2019-3822
+---
+ lib/vauth/ntlm.c | 11 +++
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
+index 0ad4d972e3..6a8fc5ab3d 100644
+--- a/lib/vauth/ntlm.c
b/lib/vauth/ntlm.c
+@@ -779,11 +779,14 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct
Curl_easy *data,
+ });
+
+ #ifdef USE_NTRESPONSES
+- if(size < (NTLM_BUFSIZE - ntresplen)) {
+-DEBUGASSERT(size == (size_t)ntrespoff);
+-memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);
+-size += ntresplen;
++ /* ntresplen + size should not be risking an integer overflow here */
++ if(ntresplen + size > sizeof(ntlmbuf)) {
++failf(data, "incoming NTLM message too big");
++return CURLE_OUT_OF_MEMORY;
+ }
++ DEBUGASSERT(size == (size_t)ntrespoff);
++ memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);
++ size += ntresplen;
+
+ DEBUG_OUT({
+ fprintf(stderr, "\n ntresp=");
diff --git a/external/curl/UnpackedTarball_curl.mk
b/external/curl/UnpackedTarball_curl.mk
index 6ecef5bb4db7..66a70ecce8c6 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -22,6 +22,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-7.26.0_win-proxy.patch \
external/curl/CVE-2018-14618.patch \
+ external/curl/CVE-2018-16890.patch \
+ external/curl/CVE-2019-3822.patch \
))
ifeq ($(OS),ANDROID)
commit 8f6b5ab3ce67c3d4f463133fb9e67be3c2a0e1c8
Author: Thorsten Behrens
AuthorDate: Sat Sep 22 19:14:00 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Feb 8 16:50:22 2019 +0100
curl: fix CVE-2018-14618
* don't upgrade to new release, just use the patch from git
Change-Id: I1f2af0cb388c6a94a817b765d0a1eff9990f1661
diff --git a/external/curl/CVE-2018-14618.patch
b/external/curl/CVE-2018-14618.patch
new file mode 100644
index ..5d99c9fb3118
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewfunc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e1e0246a5a33d9206d6310cf8a135c2cccd70f5
Author: Mike Kaganski
AuthorDate: Fri Feb 8 15:05:33 2019 +0300
Commit: Marco Cecchetti
CommitDate: Fri Feb 8 17:26:03 2019 +0100
tdf#120703 PVS: fix condition
V560 A part of conditional expression is always false:
nY == nStartRow.
Change-Id: I2d1a809400d48889780ce320be740648f8d9b97f
Reviewed-on: https://gerrit.libreoffice.org/67541
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index cc9733a52c2b..12b78243c34d 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1559,7 +1559,7 @@ void ScViewFunc::OnLOKInsertDeleteRow(SCROW nStartRow,
long nOffset)
else
{
SCROW nY =
pTabViewShell->GetViewData().GetCurYForTab(nCurrentTabIndex);
-if (nY >= nStartRow || (nY == nStartRow && nOffset > 0))
+if (nY > nStartRow || (nY == nStartRow && nOffset > 0))
{
pTabViewShell->GetViewData().SetCurYForTab(nY +
nOffset, nCurrentTabIndex);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/formatDataSeries.py | 129 +
1 file changed, 129 insertions(+)
New commits:
commit dce3d4a758cf929d55c4c7220685bf7a5d332eda
Author: Zdeněk Crhonek
AuthorDate: Fri Feb 8 16:17:24 2019 +0100
Commit: Zdenek Crhonek
CommitDate: Fri Feb 8 19:03:10 2019 +0100
uitest for sc Chart - format Data series dialog
Change-Id: I94ff22fa79c3b147bb4ea6e1976e79c08527cc39
Reviewed-on: https://gerrit.libreoffice.org/67549
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/sc/qa/uitest/chart/formatDataSeries.py
b/sc/qa/uitest/chart/formatDataSeries.py
new file mode 100644
index ..3db37320c9c5
--- /dev/null
+++ b/sc/qa/uitest/chart/formatDataSeries.py
@@ -0,0 +1,129 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+ return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+# test Chart - Data series dialog /core/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+
+class chartFormatDataSeries(UITestCase):
+ def test_chart_format_data_series_dialog(self):
+calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf93506.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
#optionsdialog, set centimeters
+xDialog = self.xUITest.getTopFocusWindow()
+
+xPages = xDialog.getChild("pages")
+xCalcEntry = xPages.getChild('3') # calc
+xCalcEntry.executeAction("EXPAND", tuple())
+xCalcGeneralEntry = xCalcEntry.getChild('0')
+xCalcGeneralEntry.executeAction("SELECT", tuple()) #General
+xMetric = xDialog.getChild("unitlb")
+props = {"TEXT": "Centimeter"}
+actionProps = mkPropertyValues(props)
+xMetric.executeAction("SELECT", actionProps)
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataSeries"}))
+xDialog = self.xUITest.getTopFocusWindow()
+#Click on tab "Options".
+tabcontrol = xDialog.getChild("tabcontrol")
+select_pos(tabcontrol, "0")
+
+primaryYAxis = xDialog.getChild("RBT_OPT_AXIS_1")
+secondaryYAxis = xDialog.getChild("RBT_OPT_AXIS_2")
+leaveGap = xDialog.getChild("RB_DONT_PAINT")
+assumeZero = xDialog.getChild("RB_ASSUME_ZERO")
+continueLine = xDialog.getChild("RB_CONTINUE_LINE")
+includeHiddenCells = xDialog.getChild("CB_INCLUDE_HIDDEN_CELLS")
+hideLegend = xDialog.getChild("CB_LEGEND_ENTRY_HIDDEN")
+
+secondaryYAxis.executeAction("CLICK", tuple())
+leaveGap.executeAction("CLICK", tuple())
+includeHiddenCells.executeAction("CLICK", tuple())
+hideLegend.executeAction("CLICK", tuple())
+
+#Click on tab "Line".
+select_pos(tabcontrol, "1")
+
+xWidth = xDialog.getChild("MF_SYMBOL_WIDTH")
+xHeight = xDialog.getChild("MF_SYMBOL_HEIGHT")
+xKeep = xDialog.getChild("CB_SYMBOL_RATIO")
+
+xKeep.executeAction("CLICK", tuple())
+xWidth.executeAction("UP", tuple())
+xWidth.executeAction("UP", tuple())
+xHeight.executeAction("UP", tuple())
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+#reopen and verify
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataSeries"}))
+xDialog = self.xUITest.getTopFocusWindow()
+#Click on tab "Options".
+tabcontrol = xDialog.getChild("tabcontrol")
+sele
Re: Minutes of the ESC call 2019-02-07 - disable popups
* Pending Action Items: + disable popups for release-build only in 6.2/.3 (Justin L) [ sent some code pointers ] Since I'm not a release engineer, I don't have a way to test the changes that I was asked to make. So I've instead created bug 123270 which a qualified individual can take. Justin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/envlop1.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e5e1eca721ec35d51c41985e3020909ab956bdc5
Author: Matteo Casalin
AuthorDate: Fri Feb 1 07:42:50 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:30:21 2019 +0100
Use indexed getToken()
Change-Id: I8ab1c2956739c9b63de807176ca0e3a640d3961f
Reviewed-on: https://gerrit.libreoffice.org/67325
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 2c765de7a5d5..3c1c9514e138 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -285,8 +285,9 @@ void SwEnvPage::InitDatabaseBox()
for (sal_Int32 i = 0; i < aDataNames.getLength(); ++i)
m_xDatabaseLB->append_text(pDataNames[i]);
-OUString sDBName = m_sActDBName.getToken( 0, DB_DELIM );
-OUString sTableName = m_sActDBName.getToken( 1, DB_DELIM );
+sal_Int32 nIdx{ 0 };
+OUString sDBName = m_sActDBName.getToken( 0, DB_DELIM, nIdx );
+OUString sTableName = m_sActDBName.getToken( 0, DB_DELIM, nIdx );
m_xDatabaseLB->set_active_text(sDBName);
if (m_pSh->GetDBManager()->GetTableNames(*m_xTableLB, sDBName))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/fields/docufld.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 15b0bc23e87aa41dc40beeaaed7e87d727af00f2
Author: Matteo Casalin
AuthorDate: Sun Feb 3 18:58:33 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:31:01 2019 +0100
Use indexed getToken()
Change-Id: I7ba78cc8ecf7d2ecface0e69dcacc9bae869c7e6
Reviewed-on: https://gerrit.libreoffice.org/67335
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index 18604635d696..1578d471d322 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1365,9 +1365,10 @@ void SwHiddenTextField::Evaluate(SwDoc* pDoc)
#if HAVE_FEATURE_DBCONNECTIVITY
if( pMgr)
{
+sal_Int32 nIdx{ 0 };
OUString sDBName( GetDBName( sTmpName, pDoc ));
-OUString sDataSource(sDBName.getToken(0, DB_DELIM));
-OUString sDataTableOrQuery(sDBName.getToken(1, DB_DELIM));
+OUString sDataSource(sDBName.getToken(0, DB_DELIM, nIdx));
+OUString sDataTableOrQuery(sDBName.getToken(0, DB_DELIM,
nIdx));
if( pMgr->IsInMerge() && !sDBName.isEmpty() &&
pMgr->IsDataSourceOpen( sDataSource,
sDataTableOrQuery, false))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/edit/autofmt.cxx | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 6e1bd43a4344f6c3dff9a6fc06fa9a6f1356e327
Author: Matteo Casalin
AuthorDate: Sun Feb 3 18:57:27 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:32:14 2019 +0100
Use indexed getToken()
Change-Id: I1fa06283b3c1857c81ec320b98db857a42e91bca
Reviewed-on: https://gerrit.libreoffice.org/67333
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index e10fbcd6f9bf..2827659def58 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1619,12 +1619,13 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl,
sal_uInt16 nDigitLevel )
{
SwCharFormat* pCFormat =
m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool(
RES_POOLCHR_NUM_LEVEL );
+
+sal_Int32 nPrefixIdx{ 0 };
if( !nDigitLevel )
{
SwNumFormat aFormat( aRule.Get( nLvl ) );
-aFormat.SetStart(
static_cast(aPrefix.getToken( 1,
-u'\x0001' ).toInt32()));
-aFormat.SetPrefix( aPrefix.getToken( 0, u'\x0001' ));
+aFormat.SetPrefix( aPrefix.getToken( 0, u'\x0001',
nPrefixIdx ));
+aFormat.SetStart(
static_cast(aPrefix.getToken( 0, u'\x0001', nPrefixIdx
).toInt32()));
aFormat.SetSuffix( aPostfix.getToken( 0, u'\x0001' ));
aFormat.SetIncludeUpperLevels( 0 );
@@ -1642,15 +1643,15 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl,
sal_uInt16 nDigitLevel )
{
auto const nSpaceSteps = nLvl ? nLeftTextPos / nLvl : 0;
sal_uInt16 n;
+sal_Int32 nPostfixIdx{ 0 };
for( n = 0; n <= nLvl; ++n )
{
SwNumFormat aFormat( aRule.Get( n ) );
-aFormat.SetStart(
static_cast(aPrefix.getToken( n+1,
-u'\x0001' ).toInt32() ));
if( !n )
-aFormat.SetPrefix( aPrefix.getToken( n, u'\x0001'
));
-aFormat.SetSuffix( aPostfix.getToken( n, u'\x0001' ));
+aFormat.SetPrefix( aPrefix.getToken( 0, u'\x0001',
nPrefixIdx )); // token 0, read only on first loop
+aFormat.SetStart(
static_cast(aPrefix.getToken( 0, u'\x0001', nPrefixIdx ).toInt32()
));
+aFormat.SetSuffix( aPostfix.getToken( 0, u'\x0001',
nPostfixIdx ));
aFormat.SetIncludeUpperLevels( MAXLEVEL );
if( n < aNumTypes.getLength() )
aFormat.SetNumberingType(static_cast(aNumTypes[ n ] - '0'));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/xml/xmltble.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit be75c3ea3037522d4abcf08d3f383d6df5f7e493
Author: Matteo Casalin
AuthorDate: Fri Feb 1 07:43:52 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:32:58 2019 +0100
Use indexed getToken()
Change-Id: I3c1df346c56bfbd6e885b5ddb78ac3162a8bc32e
Reviewed-on: https://gerrit.libreoffice.org/67327
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 58ef026cf7e1..a726de4124cb 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -1112,12 +1112,13 @@ void SwXMLExport::ExportTable( const SwTableNode&
rTableNd )
// DDE command
const OUString& sCmd = pDDEFieldType->GetCmd();
+sal_Int32 nIdx{ 0 };
AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_APPLICATION,
- sCmd.getToken(0, sfx2::cTokenSeparator) );
+ sCmd.getToken(0, sfx2::cTokenSeparator, nIdx) );
AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_ITEM,
- sCmd.getToken(1, sfx2::cTokenSeparator) );
+ sCmd.getToken(0, sfx2::cTokenSeparator, nIdx) );
AddAttribute( XML_NAMESPACE_OFFICE, XML_DDE_TOPIC,
- sCmd.getToken(2, sfx2::cTokenSeparator) );
+ sCmd.getToken(0, sfx2::cTokenSeparator, nIdx) );
// auto update
if (pDDEFieldType->GetType() == SfxLinkUpdateMode::ALWAYS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8atr.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 042c2a24f598cd9405ba98342efcb00098d70b1d
Author: Matteo Casalin
AuthorDate: Thu Jan 31 08:14:22 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:34:47 2019 +0100
Replace always true condition with a more likely one
indexOf is always lower than string length since "not found" is
encoded as -1. Original code works correctly anyway since the
"not found" case lead to copying the whole string, although this
copy is completely unnecessary.
Change-Id: Ic5dd995dd0c3f974c77b5bf209ad5e994b044385
Reviewed-on: https://gerrit.libreoffice.org/67320
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 07f4967a7247..02085761e3e9 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2866,9 +2866,9 @@ void AttributeOutputBase::TextField( const SwFormatField&
rField )
if (pDocInfoField != nullptr)
{
OUString sFieldname =
pDocInfoField->GetFieldName();
-sal_Int32 nIndex = sFieldname.indexOf(':');
-if (nIndex != sFieldname.getLength())
+const sal_Int32 nIndex = sFieldname.indexOf(':');
+if (nIndex >= 0)
sFieldname = sFieldname.copy(nIndex + 1);
sStr = "\"" + sFieldname + "\"";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/graphic/ndgrf.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit ea3045b28943e78673a669e9e1a310d374951675
Author: Matteo Casalin
AuthorDate: Sun Feb 3 19:42:22 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:35:36 2019 +0100
Initialize some OUString with proper value
Change-Id: I2f5676e9973d476aa709f9dfb4a903b09edaafeb
Reviewed-on: https://gerrit.libreoffice.org/67336
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 867e533533e3..8045a4158135 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -569,10 +569,11 @@ void SwGrfNode::InsertLink( const OUString& rGrfName,
const OUString& rFltName )
if( rFltName == "DDE" )
{
sal_Int32 nTmp = 0;
-OUString sApp, sTopic, sItem;
-sApp = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
-sTopic = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
-sItem = rGrfName.copy( nTmp );
+// Cannot use getToken as argument in function call:
+// evaluation order is undefined!
+const OUString sApp{ rGrfName.getToken( 0, sfx2::cTokenSeparator,
nTmp ) };
+const OUString sTopic{ rGrfName.getToken( 0,
sfx2::cTokenSeparator, nTmp ) };
+const OUString sItem{ rGrfName.copy( nTmp ) };
rIDLA.GetLinkManager().InsertDDELink( refLink.get(),
sApp, sTopic, sItem );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxprinter.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 88895d7451ad095510d5dbe6c760b6fbccd95b05
Author: Matteo Casalin
AuthorDate: Sat Jan 26 00:51:57 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:36:18 2019 +0100
Avoid index for single getToken call
Change-Id: I4b7dfd024369258efb84ec8d1c1cd16f4a7aa730
Reviewed-on: https://gerrit.libreoffice.org/66944
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/toolkit/source/awt/vclxprinter.cxx
b/toolkit/source/awt/vclxprinter.cxx
index aa24f31d939f..912e721b6eda 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -206,9 +206,8 @@ void VCLXPrinterPropertySet::selectForm( const OUString&
rFormDescription )
{
::osl::MutexGuard aGuard( Mutex );
-sal_Int32 nIndex = 0;
sal_uInt16 nPaperBin = sal::static_int_cast< sal_uInt16 >(
-rFormDescription.getToken( 3, ';', nIndex ).toInt32());
+rFormDescription.getToken( 3, ';' ).toInt32());
GetPrinter()->SetPaperBin( nPaperBin );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/graphic/UnoGraphicProvider.cxx | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit db6e0348a3c5d41e6a5d38a7902645e8e3c22b4a
Author: Matteo Casalin
AuthorDate: Sat Jan 26 00:27:11 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Feb 8 19:37:25 2019 +0100
getToken+comparison+copy ==> startsWith
Change-Id: I3d243cecc21b0364b2ceac1f64cbfa1764c3ddf1
Reviewed-on: https://gerrit.libreoffice.org/66938
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx
b/vcl/source/graphic/UnoGraphicProvider.cxx
index c89e83004bf0..0da9c020155d 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -151,11 +151,10 @@ uno::Reference< ::graphic::XGraphic >
GraphicProvider::implLoadMemory( const OUS
uno::Reference< ::graphic::XGraphic >
GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL )
{
uno::Reference< ::graphic::XGraphic > xRet;
-sal_Int32 nIndex = 0;
-if( rResourceURL.getToken( 0, '/', nIndex ) == "private:graphicrepository"
)
+OUString sPathName;
+if( rResourceURL.startsWith("private:graphicrepository/", &sPathName) )
{
-OUString sPathName( rResourceURL.copy( nIndex ) );
BitmapEx aBitmap;
if ( vcl::ImageRepository::loadImage( sPathName, aBitmap ) )
{
@@ -169,11 +168,10 @@ uno::Reference< ::graphic::XGraphic >
GraphicProvider::implLoadRepositoryImage(
uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage(
const OUString& rResourceURL )
{
uno::Reference< ::graphic::XGraphic > xRet;
-sal_Int32 nIndex = 0;
-if( rResourceURL.getToken( 0, '/', nIndex ) == "private:standardimage" )
+OUString sImageName;
+if( rResourceURL.startsWith("private:standardimage/", &sImageName) )
{
-OUString sImageName( rResourceURL.copy( nIndex ) );
if ( sImageName == "info" )
{
xRet =
Graphic(GetStandardInfoBoxImage().GetBitmapEx()).GetXGraphic();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source
vcl/source/window/paint.cxx | 77
1 file changed, 77 deletions(-)
New commits:
commit 1a02ab0aeafeaa97f4a46fc77ac3ef9a68904f7a
Author: Jan Holesovsky
AuthorDate: Fri Feb 8 17:57:41 2019 +0100
Commit: Andras Timar
CommitDate: Fri Feb 8 22:16:32 2019 +0100
Revert "lokit: Draw dialogs without using a MetaFile"
Quick fix for the too big previews in the font dialog.
This reverts commit a6634c01f8adcc79b7e74cc2d34de1b262139594.
Change-Id: I04cf8d604e4fa58bf591cdd817c6feddeb45e84e
Reviewed-on: https://gerrit.libreoffice.org/67550
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 7da91892fc4d..8d10d77513e4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1343,83 +1343,6 @@ void Window::Update()
void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point&
i_rPos )
{
-// Special drawing when called through LOKit
-// TODO: Move to it's own method
-if (comphelper::LibreOfficeKit::isActive())
-{
-VclPtrInstance pDevice(*i_pTargetOutDev);
-
-Size aSize(GetOutputSizePixel());
-pDevice->SetOutputSizePixel(aSize);
-
-vcl::Font aCopyFont = GetFont();
-pDevice->SetFont(aCopyFont);
-
-pDevice->SetTextColor(GetTextColor());
-if (IsLineColor())
-pDevice->SetLineColor(GetLineColor());
-else
-pDevice->SetLineColor();
-
-if (IsFillColor())
-pDevice->SetFillColor(GetFillColor());
-else
-pDevice->SetFillColor();
-
-if (IsTextLineColor())
-pDevice->SetTextLineColor(GetTextLineColor());
-else
-pDevice->SetTextLineColor();
-
-if (IsOverlineColor())
-pDevice->SetOverlineColor(GetOverlineColor());
-else
-pDevice->SetOverlineColor();
-
-if (IsTextFillColor())
-pDevice->SetTextFillColor(GetTextFillColor());
-else
-pDevice->SetTextFillColor();
-
-pDevice->SetTextAlign(GetTextAlign());
-pDevice->SetRasterOp(GetRasterOp());
-
-tools::Rectangle aPaintRect;
-aPaintRect = tools::Rectangle(Point(), GetOutputSizePixel());
-
-vcl::Region aClipRegion(GetClipRegion());
-pDevice->SetClipRegion();
-aClipRegion.Intersect(aPaintRect);
-pDevice->SetClipRegion(aClipRegion);
-
-if (!IsPaintTransparent() && IsBackground() && ! (GetParentClipMode()
& ParentClipMode::NoClip))
-Erase(*pDevice);
-
-Paint(*pDevice, tools::Rectangle(Point(), GetOutputSizePixel()));
-
-i_pTargetOutDev->DrawOutDev(i_rPos, aSize, Point(), aSize, *pDevice);
-
-// get rid of virtual device now so they don't pile up during
recursive calls
-pDevice.disposeAndClear();
-
-
-for( vcl::Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild
= pChild->mpWindowImpl->mpNext )
-{
-if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame &&
pChild->IsVisible() )
-{
-long nDeltaX = pChild->mnOutOffX - mnOutOffX;
-long nDeltaY = pChild->mnOutOffY - mnOutOffY;
-
-Point aPos( i_rPos );
-aPos += Point(nDeltaX, nDeltaY);
-
-pChild->ImplPaintToDevice( i_pTargetOutDev, aPos );
-}
-}
-return;
-}
-
-
bool bRVisible = mpWindowImpl->mbReallyVisible;
mpWindowImpl->mbReallyVisible = mpWindowImpl->mbVisible;
bool bDevOutput = mbDevOutput;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source
desktop/source/lib/init.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b79fe36b37cd02dfa992e26a30a2956d02a77ef9
Author: Michael Meeks
AuthorDate: Fri Jan 25 17:47:15 2019 +
Commit: Andras Timar
CommitDate: Fri Feb 8 22:15:40 2019 +0100
lok: don't crash in simple LOK use-case with no callback.
Change-Id: I7bceba10f002ad5751e3d810f9a9767ad2e875bc
Reviewed-on: https://gerrit.libreoffice.org/66924
Tested-by: Jenkins
Reviewed-by: Michael Meeks
(cherry picked from commit 175274a6bca20451ccd6b5574e118265449f7642)
Reviewed-on: https://gerrit.libreoffice.org/66930
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dae96c2e62b6..739b21dbaf11 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1579,8 +1579,11 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
}
LibLODocument_Impl* pDocument = new LibLODocument_Impl(xComponent);
-int nState = doc_getSignatureState(pDocument);
-pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS,
OString::number(nState).getStr(), pLib->mpCallbackData);
+if (pLib->mpCallback)
+{
+int nState = doc_getSignatureState(pDocument);
+pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS,
OString::number(nState).getStr(), pLib->mpCallbackData);
+}
return pDocument;
}
catch (const uno::Exception& exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source
sw/source/ui/misc/num.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 72909fbfdc4111f3c8cfc2f2e70dc6a1fdf97f97
Author: Henry Castro
AuthorDate: Thu Feb 7 09:21:20 2019 -0400
Commit: Andras Timar
CommitDate: Fri Feb 8 22:16:07 2019 +0100
lok: Bullets and Numbering → disable Graphic selection in Customize
Change-Id: If0f7b953a40ca1d5f469087cb8f362a949c39b37
Reviewed-on: https://gerrit.libreoffice.org/67499
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 979eff2f3433..e5bde2e15be8 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -49,6 +49,7 @@
#include
#include
#include
+#include
static bool bLastRelative = false;
@@ -957,7 +958,16 @@
SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(vcl::Window* pParent,
m_nBulletPageId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET );
AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM );
AddTabPage("graphics", RID_SVXPAGE_PICK_BMP );
-m_nOptionsPageId = AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+RemoveTabPage("customize");
+}
+else
+{
+m_nOptionsPageId = AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
+}
+
m_nPositionPageId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source filter/source
desktop/source/lib/init.cxx | 26 ++
filter/source/pdf/pdfexport.cxx | 74
filter/source/pdf/pdfexport.hxx |2 +
3 files changed, 102 insertions(+)
New commits:
commit 41a22ef27df7242ab074a3fd83720c739362263d
Author: merttumer
AuthorDate: Fri Feb 8 20:26:46 2019 +0300
Commit: Andras Timar
CommitDate: Fri Feb 8 22:27:24 2019 +0100
Added Tiled Watermark Feature for pdf export
Change-Id: I1f01e16e6958b0be4f82b13c2f3c5a91a8f05558
Signed-off-by: merttumer
Reviewed-on: https://gerrit.libreoffice.org/67551
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 739b21dbaf11..a1f4dea54c41 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1839,6 +1839,25 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
OUString aFilterOptions = getUString(pFilterOptions);
+// Check if watermark for pdf is passed by filteroptions..
+// It is not a real filter option so it must be filtered out.
+OUString watermarkText;
+int aIndex = -1;
+if ((aIndex = aFilterOptions.indexOf(",Watermark=")) >= 0)
+{
+int bIndex = aFilterOptions.indexOf("WATERMARKEND");
+watermarkText = aFilterOptions.copy(aIndex+11, bIndex-(aIndex+11));
+if(aIndex > 0)
+{
+OUString temp = aFilterOptions.copy(0, aIndex);
+aFilterOptions = temp + aFilterOptions.copy(bIndex+12);
+}
+else
+{
+aFilterOptions.clear();
+}
+}
+
// 'TakeOwnership' == this is a 'real' SaveAs (that is, the document
// gets a new name). When this is not provided, the meaning of
// saveAs() is more like save-a-copy, which allows saving to any
@@ -1867,6 +1886,13 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
aSaveMediaDescriptor["Overwrite"] <<= true;
aSaveMediaDescriptor["FilterName"] <<= aFilterName;
aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<=
aFilterOptions;
+if(!watermarkText.isEmpty())
+{
+uno::Sequence< beans::PropertyValue > aFilterData( 1 );
+aFilterData[ 0 ].Name = "TiledWatermark";
+aFilterData[ 0 ].Value <<= watermarkText;
+aSaveMediaDescriptor["FilterData"] <<= aFilterData;
+}
// add interaction handler too
if (gImpl)
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index ca454bbd65f7..6c9e7b90320c 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -499,6 +499,8 @@ bool PDFExport::Export( const OUString& rFile, const
Sequence< PropertyValue >&
rFilterData[ nData ].Value >>= mbAddStream;
else if ( rFilterData[ nData ].Name == "Watermark" )
rFilterData[ nData ].Value >>= msWatermark;
+else if ( rFilterData[ nData ].Name == "TiledWatermark" )
+rFilterData[ nData ].Value >>= msTiledWatermark;
// now all the security related properties...
else if ( rFilterData[ nData ].Name == "EncryptFile" )
rFilterData[ nData ].Value >>= mbEncrypt;
@@ -1038,7 +1040,13 @@ bool PDFExport::ImplExportPage( vcl::PDFWriter& rWriter,
vcl::PDFExtOutDevData&
rPDFExtOutDevData.ResetSyncData();
if (!msWatermark.isEmpty())
+{
ImplWriteWatermark( rWriter, Size(aRangePDF.getWidth(),
aRangePDF.getHeight()) );
+}
+else if (!msTiledWatermark.isEmpty())
+{
+ImplWriteTiledWatermark( rWriter, Size(aRangePDF.getWidth(),
aRangePDF.getHeight()) );
+}
return true;
}
@@ -,4 +1119,70 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter&
rWriter, const Size& rPageSi
rWriter.Pop();
}
+void PDFExport::ImplWriteTiledWatermark( vcl::PDFWriter& rWriter, const Size&
rPageSize )
+{
+vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 40 ) );
+aFont.SetItalic( ITALIC_NONE );
+aFont.SetWidthType( WIDTH_NORMAL );
+aFont.SetWeight( WEIGHT_BOLD );
+aFont.SetAlignment( ALIGN_BOTTOM );
+aFont.SetFontHeight(40);
+
+OutputDevice* pDev = rWriter.GetReferenceDevice();
+pDev->SetFont(aFont);
+pDev->Push();
+pDev->SetFont(aFont);
+pDev->SetMapMode( MapMode( MapUnit::MapPoint ) );
+int w = 0;
+long nTextWidth = (rPageSize.Width()-60) / 4;
+while((w = pDev->GetTextWidth(msTiledWatermark)) > nTextWidth)
+{
+if(w==0)
+break;
+
+long nNewHeight = aFont.GetFontHeight() * nTextWidth / w;
+aFont.SetFontHeight(nNewHeight);
+pDev->SetFont( aFont );
+}
+pDev->Pop();
+
+rWriter.Push();
+rWriter.SetMapMode( M
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - kit/ChildSession.cpp
kit/ChildSession.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3f266d5d6899b7b4bc3a9cf548842629c04510af
Author: merttumer
AuthorDate: Fri Feb 8 20:32:19 2019 +0300
Commit: Andras Timar
CommitDate: Fri Feb 8 22:27:56 2019 +0100
Added passing watermark text to saveAs for tiled watermark
Change-Id: I6a69c414e44b9a3c095d00b4101dd07b11d3fbb0
Signed-off-by: merttumer
Reviewed-on: https://gerrit.libreoffice.org/67552
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 2b8534c01..86c6dfe24 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -854,6 +854,8 @@ bool ChildSession::downloadAs(const char* /*buffer*/, int
/*length*/, const std:
{
filterOptions += Poco::cat(std::string(" "), tokens.begin() + 5,
tokens.end());
}
+//HACK = add watermark to filteroptions
+filterOptions += std::string(",Watermark=") + getWatermarkText() +
std::string("WATERMARKEND");
}
// The file is removed upon downloading.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/README
svtools/README | 15 --- 1 file changed, 15 deletions(-) New commits: commit f42554a1886ebe49170c25096dc3281b2c7bb1f4 Author: Tomaž Vajngerl AuthorDate: Fri Feb 8 21:18:23 2019 +0100 Commit: Tomaž Vajngerl CommitDate: Fri Feb 8 22:27:20 2019 +0100 remove obsolete image handling description from README Change-Id: I94023bc1a8eb1b6d31416292eccf220ba1c29efc Reviewed-on: https://gerrit.libreoffice.org/67569 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/svtools/README b/svtools/README index dbcc30b39035..dc35c3f38702 100644 --- a/svtools/README +++ b/svtools/README @@ -1,16 +1 @@ Tools on top of VCL. Common dialogs, file and print dialogs, wizards, vcl filters, lots of helper code. - - -== Image swapping == - -LO has two kind of swapout mechanisms: - -1) Size based auto swapping: when the size of all graphic objects reaches a configurable limit (20 MB by default) -then some of the graphics are saved to the local file system and freed in the memory. -Configure: Tools -> Options -> Memory -> GraphicsCache -> Use for LibreOffice - -2) Time based auto swapping: after an image is swapped in / loaded a timer starts and when the timer (1 min by default) -has a time out this image is swapped out ( sometimes this time out is ignored when the image is in use ). -Configure: Tools -> Options -> Memory -> GraphicsCache -> Remove from memory after - -Both swapping are done by GraphicObject and GraphicManager. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/source
sc/source/core/data/column.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 650f3ee43c22a00c15799d31995b22fc8e0742c9 Author: Eike Rathke AuthorDate: Wed Feb 6 14:53:26 2019 +0100 Commit: Kohei Yoshida CommitDate: Sat Feb 9 01:10:10 2019 +0100 Resolves: tdf#121002 UpdateRefOnNonCopy::mbUpdated=true if references change ... somewhere in a previous shared formula group, so for the new groups after split the column is added to sc::RefUpdateContext::maRegroupCols in ScColumn::UpdateReference() to setup new listeners later, and true returned there, which also results in ScTable::SetStreamValid(false) at the end, which in this constellation wasn't the case. It may have been a reason that some documents have individual unrecalculated results stored (i.e. values moved within ranges that a shared formula group pointed to) that can be corrected by recalculating after load. Said to be a regression from commit 2f6a06856ad8df0c11a112d1e457b408e9a7af1d CommitDate: Fri Jun 5 16:22:38 2015 +0200 tdf#90694 reset group area listeners when splitting group but that only uncovered this misbehaviour. Change-Id: I6b04b71898c3f1774452dd19790c208f3167d8eb Reviewed-on: https://gerrit.libreoffice.org/67461 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit cdfa8b27f28328612b6734533981c1b363ced0a0) Reviewed-on: https://gerrit.libreoffice.org/67465 Reviewed-by: Kohei Yoshida diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index bfd11e038bf0..a7119c52dc64 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2262,6 +2262,8 @@ class UpdateRefOnNonCopy p->SetDirty(); } +mbUpdated = true; + // Move from clipboard is Cut&Paste, then do not copy the original // positions' formula cells to the Undo document. if (!mbClipboardSource || !bCellMoved) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source
sc/source/core/data/column.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 439407a36e4085c17c65c620a1bb2ca95f4564b0 Author: Eike Rathke AuthorDate: Wed Feb 6 14:53:26 2019 +0100 Commit: Kohei Yoshida CommitDate: Sat Feb 9 01:10:48 2019 +0100 Resolves: tdf#121002 UpdateRefOnNonCopy::mbUpdated=true if references change ... somewhere in a previous shared formula group, so for the new groups after split the column is added to sc::RefUpdateContext::maRegroupCols in ScColumn::UpdateReference() to setup new listeners later, and true returned there, which also results in ScTable::SetStreamValid(false) at the end, which in this constellation wasn't the case. It may have been a reason that some documents have individual unrecalculated results stored (i.e. values moved within ranges that a shared formula group pointed to) that can be corrected by recalculating after load. Said to be a regression from commit 2f6a06856ad8df0c11a112d1e457b408e9a7af1d CommitDate: Fri Jun 5 16:22:38 2015 +0200 tdf#90694 reset group area listeners when splitting group but that only uncovered this misbehaviour. Change-Id: I6b04b71898c3f1774452dd19790c208f3167d8eb Reviewed-on: https://gerrit.libreoffice.org/67461 Reviewed-by: Eike Rathke Tested-by: Jenkins (cherry picked from commit cdfa8b27f28328612b6734533981c1b363ced0a0) Reviewed-on: https://gerrit.libreoffice.org/67466 Reviewed-by: Kohei Yoshida diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index d8f164e0c916..6e34a6757fe5 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2264,6 +2264,8 @@ class UpdateRefOnNonCopy p->SetDirty(); } +mbUpdated = true; + // Move from clipboard is Cut&Paste, then do not copy the original // positions' formula cells to the Undo document. if (!mbClipboardSource || !bCellMoved) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/items/numfmtsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e12e3300592438b06b5649deaf84574de5066ba
Author: Eike Rathke
AuthorDate: Fri Feb 8 20:46:36 2019 +0100
Commit: Eike Rathke
CommitDate: Sat Feb 9 02:56:24 2019 +0100
Resolves: tdf#123122 category is just one bit, date+time is two bits set
DATE|TIME != DATE ...
Regression from
commit e85966450b770e1169f113183ce1a9a9f4dcc507
CommitDate: Wed Oct 3 12:08:55 2018 +0200
Related: tdf#119613 tdf#118127 suppress duplicated builtins, rework
All cat
Change-Id: If500dbeae00805f04f61586730479901b27d3901
Reviewed-on: https://gerrit.libreoffice.org/67554
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index feb595e11363..85c051fbc226 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1035,7 +1035,7 @@ short
SvxNumberFormatShell::FillEListWithUsD_Impl(std::vector& rList,
{
const SvNumberformat* pNumEntry = rEntry.second;
-if (bCategoryMatch && pNumEntry->GetMaskedType() != eCategory)
+if (bCategoryMatch && (pNumEntry->GetMaskedType() & eCategory) !=
eCategory)
continue; // for; type does not match category if not ALL
const bool bUserDefined = bool(pNumEntry->GetType() &
SvNumFormatType::DEFINED);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Principle of least surprise
Indeed - I just created a 3-cell sheet to check this out, and - it is a behavior broken beyond any justification attempt. Moreover, I spent sometimes in the options dialog box (that just the looks the same ms office did in 1996), searching for a way to disable the "convert e-mail to hyperlink" behavior applcation wise, and could not find any. (Which does not mean it is not there, just that it is another broken point in the UI). Anyway, even with auto-hyperlink creation for e-mails and urls, in the sheet case it should be a no-brainer that first click: selects cell; second-click: activates link. best regards, js -><- On Fri, 8 Feb 2019 at 07:46, Wols Lists wrote: > On 08/02/19 09:04, Piet van Oostrum wrote: > > Wol writes: > > > >> On 06/02/2019 22:33, Piet van Oostrum wrote: > >> > >> Wols Lists wrote: > >> > >> > On 06/02/19 16:08, Piet van Oostrum wrote: > >> > > Wol's lists writes: > >> > > > >> > >> Dunno whether this is a bug or a design decision or what, but > it's a > >> > >> pretty nasty breach of the principle ... > >> > >> > >> > >> Why, when I click on a cell, does calc NOT select the clicked > cell? > >> > >> > >> > >> Okay, I know the answer - it's a hyperlink. BUT. > >> > >> > >> > >> I was editing a csv, I've got a column of email addresses, > and some of > >> > >> them have been hyperlinked, some of them haven't. I don't want > >> > >> hyperlinks, I didn't ask for hyperlinks, and I can't see any > way of > >> > >> easily removing them! > >> > >> > >> > > Format > Clear Direct Formatting (Ctrl-M on my Mac). > >> > > > >> > But clicking on the cell doesn't select it so M doesn't > work! :-) > >> > > >> > >> You could click in a nearby cell and move to it with the arrows. > >> > >> Sorry, I don't know whether it's my poor English or that you aren't a > native speaker, but you seem > >> to be completely missing my main point. > >> > >> THE NEED FOR A WORK-AROUND INDICATES THE EXISTENCE OF A MAJOR UI > FUCK-UP! > >> > >> Clicking in a cell to select it is such a basic piece of spreadsheet > functionality, that for it to > >> not work is a major problem. Things like that should work ONE HUNDRED > percent of the time, not > >> ninety-nine percent. Any safety guy will tell you that something that > nearly always works is > >> actually far more dangerous than something that keeps going wrong. > >> > >> Oh - and I've just played with the same spreadsheet in Excel. That > fucks it up too, just not quite > >> so dangerously. It selects the cell, which is good, but launches the > link at the same time. So at > >> least you get a clear visual surprise, unlike Calc which just silently > fails to work as expected > >> ... > > > > No need to SHOUT. I agree that selecting a cell just by clicking is a > basic functionality. And so is following a link when you click on it. So > now there is a conflict of interests. It would be nice if you had the > option to choose which one you prefer, because this is user-dependent. > Apparently LO choose to give the link priority. So if you don't like that, > switch off the links. See the part of my post that you cut out. > > > Sorry. But if that's the case, why does LO do NEITHER? > > Point is, if I'm using calc, I'm using a spreadsheet. I expect it to > behave like a spreadsheet, not a browser. And the current functionality > is DANGEROUS. I shouldn't have to go and change the options to make calc > behave like a spreadsheet. > > As I said, I only discovered this because I was using calc *as a > spreadsheet* and suddenly discovered that it was (a) making changes > behind my back, and (b) as a result of those changes, I'd damaged my > spreadsheet! > > Again, we can probably blame it on Microsoft :-) but really I would > prefer my spreadsheet to behave like a spreadsheet, not a browser. And > that's why I was shouting. You're not addressing my point which is that, > imho, it is a *major* design fail for the *default* behaviour to > suddenly behave in a completely different (*and* *dangerous*) way. If > you're in a car, would you really like a corner case, where, every time, > by default the car swapped the brake and accelerator over if you were > turning right in third gear? The car is being completely deterministic - > all you have to do is remember to use the other foot! Maybe I'm too > naive, but should I really have to mess around with the settings to get > a single-click to work the same way here as it does EVERYWHERE else? > > Oh - and this has ramifications elsewhere. Probably the easiest way for > me to try and fix this is that whenever calc converts text to a > hyperlink, is to just Z to undo the hyperlink. Except last time I > hit this in calc, Z didn't work that way, I just could NOT disable > calc's autoformat. Oh - and the standard way of disabling the autoformat > didn't work because it was doing it elsewhere. I think I need to go and > see whe
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/PieChart.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 033ebc5a5d76bff179ca778412e6923b605217d5 Author: Andrea Gelmini AuthorDate: Thu Feb 7 18:37:34 2019 + Commit: Adolfo Jayme Barrientos CommitDate: Sat Feb 9 05:33:59 2019 +0100 Fix typo Change-Id: I72fafb21ac51de7537622b5265af266073cdb293 Reviewed-on: https://gerrit.libreoffice.org/67576 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index daf53dcac8b5..662a9a842db7 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -625,7 +625,7 @@ void PieChart::createShapes() double fLogicYValue = fabs(pSeries->getYValue( nPointIndex )); if( ::rtl::math::isNan(fLogicYValue) ) continue; -if(fLogicYValue==0.0)//@todo: continue also if the resolution to small +if(fLogicYValue==0.0)//@todo: continue also if the resolution is too small continue; double fLogicYPos = fLogicYForNextPoint; fLogicYForNextPoint += fLogicYValue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Principle of least surprise
Hi! Well - I tend to agree that having the hyperlinks malfunctional is not nice. *Possibly* the idea behind showing "hand" cursor over such URLs even without holding CTRL required for their activation could be to allow user an easy way to identify the links... but even then, showing cursor does not necessarily imply that clicking should give both no following the hyperlink, and no cell selection. On 09.02.2019 6:23, Joao S. O. Bueno wrote: > Moreover, I spent sometimes in the options dialog box (that just the > looks the > same ms office did in 1996), searching for a way to disable the "convert > e-mail > to hyperlink" behavior applcation wise, and could not find any. (Which > does not > mean it is not there, just that it is another broken point in the UI). Heh, it looks like placing all controls for what changes input in one "AutoCorrect" dialog is indeed just another broken UI. We need better put it in many different places all over the application instead. -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: Principle of least surprise
Hi All, Is it possible to hit ctrl+K to open the hyperlink window so you can clear the hyperlinks? If I am not mistaken that is how excel does it to allow you to add or remove hyperlinks. -Original Message- From: LibreOffice On Behalf Of Kaganski Mike Sent: 09 February 2019 08:31 To: gwid...@gmail.com; Wols Lists Cc: Piet van Oostrum ; libreoffice@lists.freedesktop.org Subject: Re: Principle of least surprise Hi! Well - I tend to agree that having the hyperlinks malfunctional is not nice. *Possibly* the idea behind showing "hand" cursor over such URLs even without holding CTRL required for their activation could be to allow user an easy way to identify the links... but even then, showing cursor does not necessarily imply that clicking should give both no following the hyperlink, and no cell selection. On 09.02.2019 6:23, Joao S. O. Bueno wrote: > Moreover, I spent sometimes in the options dialog box (that just the > looks the same ms office did in 1996), searching for a way to disable > the "convert e-mail to hyperlink" behavior applcation wise, and could > not find any. (Which does not mean it is not there, just that it is > another broken point in the UI). Heh, it looks like placing all controls for what changes input in one "AutoCorrect" dialog is indeed just another broken UI. We need better put it in many different places all over the application instead. -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
