[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/unocore/unosrch.cxx | 319 -
sw/source/core/view/vprint.cxx | 17 -
2 files changed, 149 insertions(+), 187 deletions(-)
New commits:
commit 81d7755d026f1f7b34140d5a090a7ee24c7f62f3
Author: Noel Grandin
AuthorDate: Fri Sep 14 13:54:12 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Sep 18 08:59:27 2018 +0200
loplugin:useuniqueptr in SwViewShell::PrintOrPDFExport
Change-Id: Id32017ea2d3214e2bb568501ec633f182c5766de
Reviewed-on: https://gerrit.libreoffice.org/60603
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index ebae2c55c8f0..82a677aea364 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -492,7 +492,7 @@ bool SwViewShell::PrintOrPDFExport(
// It is implemented this way because PDF export calls this Prt function
// once per page and we do not like to always have the temporary document
// to be created that often here.
-SwViewShell *pShell = new SwViewShell(*this, nullptr, pOutDev);
+std::unique_ptr pShell(new SwViewShell(*this, nullptr,
pOutDev));
SdrView *pDrawView = pShell->GetDrawView();
if (pDrawView)
@@ -503,7 +503,7 @@ bool SwViewShell::PrintOrPDFExport(
{ // additional scope so that the CurrShell is reset before destroying
the shell
-SET_CURR_SHELL( pShell );
+SET_CURR_SHELL( pShell.get() );
//JP 01.02.99: Bug 61335 - the ReadOnly flag is never copied
if( mpOpt->IsReadonly() )
@@ -519,7 +519,7 @@ bool SwViewShell::PrintOrPDFExport(
"SwViewShell::PrintOrPDFExport: nPage not valid" );
SwViewShell *const pViewSh2 = (nPage < 0)
? rPrintData.GetRenderData().m_pPostItShell.get()// post-it
page
-: pShell; // a 'regular' page, not one from the post-it doc
+: pShell.get(); // a 'regular' page, not one from the post-it
doc
SwPageFrame const*const pStPage =
sw_getPage(*pViewSh2->GetLayout(), abs(nPage));
@@ -577,7 +577,7 @@ bool SwViewShell::PrintOrPDFExport(
}
}
-delete pShell;
+pShell.reset();
// restore settings of OutputDevice (should be done always now since the
// output device is now provided by a call from outside the Writer)
@@ -591,14 +591,14 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const
SwViewOption *pOpt, const SwPrintD
{
// For printing a shell is needed. Either the Doc already has one, than we
// create a new view, or it has none, than we create the first view.
-SwViewShell *pSh;
+std::unique_ptr pSh;
if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() )
-pSh = new SwViewShell(
*pDoc->getIDocumentLayoutAccess().GetCurrentViewShell(), nullptr,
&rRenderContext,VSHELLFLAG_SHARELAYOUT );
+pSh.reset(new SwViewShell(
*pDoc->getIDocumentLayoutAccess().GetCurrentViewShell(), nullptr,
&rRenderContext,VSHELLFLAG_SHARELAYOUT ));
else
-pSh = new SwViewShell( *pDoc, nullptr, pOpt, &rRenderContext);
+pSh.reset(new SwViewShell( *pDoc, nullptr, pOpt, &rRenderContext));
{
-SET_CURR_SHELL( pSh );
+SET_CURR_SHELL( pSh.get() );
pSh->PrepareForPrint( rOptions );
pSh->SetPrtFormatOption( true );
@@ -625,7 +625,6 @@ void SwViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption
*pOpt, const SwPrintD
rRenderContext.Pop();
// first the CurrShell object needs to be destroyed!
}
-delete pSh;
}
/// Check if the DocNodesArray contains fields.
commit ddb67a4e6ec3e9de6cf5b2e47c1ce3d9cfd2b05d
Author: Noel Grandin
AuthorDate: Fri Sep 14 13:53:52 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Sep 18 08:59:16 2018 +0200
loplugin:useuniqueptr in SwSearchProperties_Impl::FillItemSet
Change-Id: I731a57bff9f74811b240b6eaabbafed833b2fbd3
Reviewed-on: https://gerrit.libreoffice.org/60602
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/unocore/unosrch.cxx
b/sw/source/core/unocore/unosrch.cxx
index 69f473051a03..62aaccb29819 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -116,53 +116,53 @@ const uno::Sequence< beans::PropertyValue >
SwSearchProperties_Impl::GetProperti
void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, bool
bIsValueSearch) const
{
-SfxPoolItem* pBoxItem = nullptr,
-*pCharBoxItem = nullptr,
-*pBreakItem = nullptr,
-*pAutoKernItem = nullptr,
-*pWLineItem = nullptr,
-*pTabItem = nullptr,
-*pSplitItem = nullptr,
-*pRegItem = nullptr,
-*pLineSpaceItem = nullptr,
-*pLineNumItem = nullptr,
-*pKeepItem = nullptr,
-*pLRItem = nullptr,
-*pULItem = nullptr,
-*pBackItem = nullptr,
-*pAdjItem = nullptr,
-*pDescItem = nullptr,
-*pInetItem = nullptr,
-*pDropItem = n
[Libreoffice-commits] core.git: include/vbahelper vbahelper/source
include/vbahelper/vbacollectionimpl.hxx |2 +-
include/vbahelper/vbadialogbase.hxx |2 +-
include/vbahelper/vbadocumentsbase.hxx |2 +-
include/vbahelper/vbaeventshelperbase.hxx|4 ++--
include/vbahelper/vbafontbase.hxx|2 +-
include/vbahelper/vbahelper.hxx |6 +++---
include/vbahelper/vbashape.hxx |2 +-
vbahelper/source/msforms/vbacontrol.cxx |4 ++--
vbahelper/source/msforms/vbacontrols.cxx |4 ++--
vbahelper/source/msforms/vbacontrols.hxx |4 ++--
vbahelper/source/msforms/vbalistcontrolhelper.cxx|4 ++--
vbahelper/source/msforms/vbamultipage.cxx|2 +-
vbahelper/source/msforms/vbatextbox.hxx |2 +-
vbahelper/source/vbahelper/vbacolorformat.hxx|2 +-
vbahelper/source/vbahelper/vbacommandbar.hxx |4 ++--
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx |2 +-
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx |2 +-
17 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit cc34b5a4c2d231de3882508654f15765d29f44c9
Author: Noel Grandin
AuthorDate: Mon Sep 17 11:21:25 2018 +0200
Commit: Noel Grandin
CommitDate: Tue Sep 18 08:56:48 2018 +0200
loplugin:constfields in vbahelper
Change-Id: I6121e2b41a5e6116be8027fe5197ce53d8f6797f
Reviewed-on: https://gerrit.libreoffice.org/60562
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index 790e68f86907..f2adf5b302e8 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -238,7 +238,7 @@ typedef InheritedHelperInterfaceImpl< Ifc... > BaseColBase;
protected:
css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
-bool mbIgnoreCase;
+bool const mbIgnoreCase;
/// @throws css::uno::RuntimeException
virtual css::uno::Any getItemByStringIndex( const OUString& sIndex )
diff --git a/include/vbahelper/vbadialogbase.hxx
b/include/vbahelper/vbadialogbase.hxx
index 4c7a2636917a..c5578f10d009 100644
--- a/include/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
@@ -45,7 +45,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase >
VbaDialogBase_BASE;
class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
{
protected:
-sal_Int32 mnIndex;
+sal_Int32 const mnIndex;
css::uno::Reference< css::frame::XModel > m_xModel;
public:
VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext, const
css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex
):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel( xModel
) {}
diff --git a/include/vbahelper/vbadocumentsbase.hxx
b/include/vbahelper/vbadocumentsbase.hxx
index ac6d316a0256..6530d734a0c9 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -56,7 +56,7 @@ public:
};
private:
-DOCUMENT_TYPE meDocType;
+DOCUMENT_TYPE const meDocType;
public:
/// @throws css::uno::RuntimeException
diff --git a/include/vbahelper/vbaeventshelperbase.hxx
b/include/vbahelper/vbaeventshelperbase.hxx
index 042ad7439b8f..777815ce20a1 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -122,8 +122,8 @@ protected:
struct EventQueueEntry
{
-sal_Int32 mnEventId;
-css::uno::Sequence< css::uno::Any > maArgs;
+sal_Int32 const mnEventId;
+css::uno::Sequence< css::uno::Any > const maArgs;
/*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId(
nEventId ) {}
EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence<
css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {}
};
diff --git a/include/vbahelper/vbafontbase.hxx
b/include/vbahelper/vbafontbase.hxx
index 32c8270e1783..d12e13ddfbf1 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -47,7 +47,7 @@ class VBAHELPER_DLLPUBLIC VbaFontBase : public
VbaFontBase_BASE
protected:
css::uno::Reference< css::beans::XPropertySet > mxFont;
css::uno::Reference< css::container::XIndexAccess > mxPalette;
-bool mbFormControl;
+bool const mbFormControl;
public:
// use local constants there is no need to expose these constants
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index ff9eca3f232f..e070a29d59ca 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -243,9 +243,9 @@ private:
css::uno::Reference< css::awt::XWindow > mxWindow;
css
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/app.hrc | 19 +-
sd/inc/strings.hrc | 18 +-
sd/source/core/drawdoc4.cxx | 386 ++--
sd/source/core/stlpool.cxx | 18 +-
sd/source/core/stlsheet.cxx | 23 ++
5 files changed, 291 insertions(+), 173 deletions(-)
New commits:
commit 99102d4263189d347c7a7d0df8fd782e8c4c8ad5
Author: heiko tietze
AuthorDate: Thu Sep 13 19:31:49 2018 +0200
Commit: Heiko Tietze
CommitDate: Tue Sep 18 08:51:32 2018 +0200
tdf#94369 - Default set of Impress graphic styles
Several drawing styles added
Change-Id: I3c0efcdc5c0462844f84f5dbb355cfa800a70898
Reviewed-on: https://gerrit.libreoffice.org/60444
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 40b36b26f41c..391371e35206 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -24,12 +24,19 @@
// Helper IDs for templates
#define HID_STANDARD_STYLESHEET_NAME(HID_SD_START + 70)
-#define HID_POOLSHEET_TEXT (HID_SD_START + 71)
-#define HID_POOLSHEET_TITLE (HID_SD_START + 72)
#define HID_POOLSHEET_OBJWITHOUTFILL(HID_SD_START + 73)
#define HID_POOLSHEET_OBJNOLINENOFILL (HID_SD_START + 74)
-#define HID_POOLSHEET_HEADLINE (HID_SD_START + 75)
-#define HID_POOLSHEET_MEASURE (HID_SD_START + 76)
+#define HID_POOLSHEET_TEXT (HID_SD_START + 71)
+#define HID_POOLSHEET_A4(HID_SD_START + 104)
+#define HID_POOLSHEET_A4_TITLE (HID_SD_START + 72)
+#define HID_POOLSHEET_A4_HEADLINE (HID_SD_START + 75)
+#define HID_POOLSHEET_A4_TEXT (HID_SD_START + 105)
+#define HID_POOLSHEET_A0(HID_SD_START + 109)
+#define HID_POOLSHEET_A0_TITLE (HID_SD_START + 110)
+#define HID_POOLSHEET_A0_HEADLINE (HID_SD_START + 111)
+#define HID_POOLSHEET_A0_TEXT (HID_SD_START + 112)
+#define HID_POOLSHEET_GRAPHIC (HID_SD_START + 106)
+#define HID_POOLSHEET_SHAPES(HID_SD_START + 107)
#define HID_POOLSHEET_FILLED(HID_SD_START + 77)
#define HID_POOLSHEET_FILLED_BLUE (HID_SD_START + 78)
#define HID_POOLSHEET_FILLED_GREEN (HID_SD_START + 79)
@@ -40,6 +47,10 @@
#define HID_POOLSHEET_OUTLINE_GREEN (HID_SD_START + 84)
#define HID_POOLSHEET_OUTLINE_RED (HID_SD_START + 102)
#define HID_POOLSHEET_OUTLINE_YELLOW(HID_SD_START + 103)
+#define HID_POOLSHEET_LINES (HID_SD_START + 108)
+#define HID_POOLSHEET_MEASURE (HID_SD_START + 76)
+#define HID_POOLSHEET_LINES_DASHED (HID_SD_START + 113) //dummy
+#define HID_POOLSHEET_LAST (HID_SD_START + 114) //dummy
#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85)
#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86)
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index c076da9895a4..986b318f4628 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -313,12 +313,22 @@
#define STR_STANDARD_STYLESHEET_NAME
NC_("STR_STANDARD_STYLESHEET_NAME", "Default" )
#define STR_UNDO_MOVEPAGES
NC_("STR_UNDO_MOVEPAGES", "Move slides" )
-#define STR_POOLSHEET_MEASURE
NC_("STR_POOLSHEET_MEASURE", "Dimension Line" )
-#define STR_POOLSHEET_TEXT
NC_("STR_POOLSHEET_TEXT", "Text" )
-#define STR_POOLSHEET_TITLE
NC_("STR_POOLSHEET_TITLE", "Title" )
-#define STR_POOLSHEET_HEADLINE
NC_("STR_POOLSHEET_HEADLINE", "Heading" )
#define STR_POOLSHEET_OBJWITHOUTFILL
NC_("STR_POOLSHEET_OBJWITHOUTFILL", "Object without fill" )
#define STR_POOLSHEET_OBJNOLINENOFILL
NC_("STR_POOLSHEET_OBJNOLINENOFILL", "Object with no fill and no line" )
+#define STR_POOLSHEET_TEXT
NC_("STR_POOLSHEET_TEXT", "Text" )
+#define STR_POOLSHEET_A4
NC_("STR_POOLSHEET_A4", "A4" )
+#define STR_POOLSHEET_A4_TITLE
NC_("STR_POOLSHEET_A4_TITLE", "Title A4" )
+#define STR_POOLSHEET_A4_HEADLINE
NC_("STR_POOLSHEET_A4_HEADLINE", "Heading A4" )
+#define STR_POOLSHEET_A4_TEXT
NC_("STR_POOLSHEET_A4_TEXT", "Text A4" )
+#define STR_POOLSHEET_A0
NC_("STR_POOLSHEET_A0", "A0" )
+#define STR_POOLSHEET_A0_TITLE
NC_("STR_POOLSHEET_A0_TITLE", "Title A0" )
+#define STR_POOLSHEET_A0_HEADLINE
NC_("STR_POOLSHEET_A0_HEADLINE", "Heading A0" )
+#define STR_POOLSHEET_A0_TEXT
NC_("STR_POOLSHEET_A0_TEXT", "Text A0" )
+#define STR_POOLSHEET_GRAPHIC
NC_("STR_POOLSHEET_GRAPHIC", "Graphic" )
+#define STR_POOLSHEET_SHAPES
NC_("STR_P
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/colorscale.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5be8dbd98b09b73319a7c5baf0473c29cd5d05b6 Author: Stephan Bergmann AuthorDate: Tue Sep 18 07:33:39 2018 +0200 Commit: Stephan Bergmann CommitDate: Tue Sep 18 08:42:18 2018 +0200 Don't prematurely cast to sal_uInt8, to avoid UB ...e.g. during UITest_conditional_format (https://ci.libreoffice.org//job/lo_ubsan/1039/): > /sc/source/core/data/colorscale.cxx:524:48: runtime error: value -33.2609 is outside the range of representable values of type 'unsigned char' > #0 0x2b778b7d666d in (anonymous namespace)::GetColorValue(double, double, unsigned char, double, unsigned char) /sc/source/core/data/colorscale.cxx:524:48 > #1 0x2b778b7bd096 in (anonymous namespace)::CalcColor(double, double, Color const&, double, Color const&) /sc/source/core/data/colorscale.cxx:530:25 > #2 0x2b778b7bcb94 in ScColorScaleFormat::GetColor(ScAddress const&) const /sc/source/core/data/colorscale.cxx:625:20 > #3 0x2b778b8906a4 in ScConditionalFormat::GetData(ScRefCellValue&, ScAddress const&) const /sc/source/core/data/conditio.cxx:1830:33 > #4 0x2b778cb8968a in (anonymous namespace)::handleConditionalFormat(ScConditionalFormatList&, std::__debug::vector > const&, CellInfo*, ScStyleSheetPool*, ScAddress const&, bool&, bool&, bool) /sc/source/core/data/fillinfo.cxx:301:34 > #5 0x2b778cb74e49 in ScDocument::FillInfo(ScTableInfo&, short, int, short, int, short, double, double, bool, bool, ScMarkData const*) /sc/source/core/data/fillinfo.cxx:581:54 > #6 0x2b77941656c0 in ScPrintFunc::DrawToDev(ScDocument*, OutputDevice*, double, tools::Rectangle const&, ScViewData*, bool) /sc/source/ui/view/printfun.cxx:539:5 > #7 0x2b77914e965b in ScDocShell::Draw(OutputDevice*, JobSetup const&, unsigned short) /sc/source/ui/docshell/docsh4.cxx:2032:9 > #8 0x2b76f7004296 in SfxObjectShell::DoDraw_Impl(OutputDevice*, Point const&, Fraction const&, Fraction const&, JobSetup const&, unsigned short) /sfx2/source/doc/objembed.cxx:229:5 > #9 0x2b76f7001b81 in SfxObjectShell::DoDraw(OutputDevice*, Point const&, Size const&, JobSetup const&, unsigned short) /sfx2/source/doc/objembed.cxx:176:9 > #10 0x2b76f6fd8fe3 in SfxObjectShell::CreatePreviewMetaFile_Impl(bool) const /sfx2/source/doc/objcont.cxx:168:5 > #11 0x2b76f6fd618b in SfxObjectShell::GetPreviewMetaFile(bool) const /sfx2/source/doc/objcont.cxx:115:12 > #12 0x2b76f55728ab in SfxPickListImpl::AddDocumentToPickList(SfxObjectShell*) /sfx2/source/appl/sfxpicklist.cxx:134:54 > #13 0x2b76f5576d93 in SfxPickListImpl::Notify(SfxBroadcaster&, SfxHint const&) /sfx2/source/appl/sfxpicklist.cxx:222:17 > #14 0x2b76fc444921 in SfxBroadcaster::Broadcast(SfxHint const&) /svl/source/notify/SfxBroadcaster.cxx:49:13 > #15 0x2b76f4eb062c in SfxEventAsyncer_Impl::IdleHdl(Timer*) /sfx2/source/appl/appcfg.cxx:119:5 > #16 0x2b76f4eaf705 in SfxEventAsyncer_Impl::LinkStubIdleHdl(void*, Timer*) /sfx2/source/appl/appcfg.cxx:114:1 > #17 0x2b7724e683b7 in Link::Call(Timer*) const /include/tools/link.hxx:84:45 > #18 0x2b7724e67599 in Timer::Invoke() /vcl/source/app/timer.cxx:77:5 > #19 0x2b7724c40779 in Scheduler::ProcessTaskScheduling() /vcl/source/app/scheduler.cxx:451:13 > #20 0x2b7724c3b168 in Scheduler::CallbackTaskScheduling() /vcl/source/app/scheduler.cxx:270:5 > #21 0x2b7725b02fac in SalTimer::CallCallback() /vcl/inc/saltimer.hxx:55:13 > #22 0x2b7725af43a5 in SvpSalInstance::CheckTimeout(bool) /vcl/headless/svpinst.cxx:206:21 > #23 0x2b7725afbc52 in SvpSalInstance::DoYield(bool, bool) /vcl/headless/svpinst.cxx:418:14 > #24 0x2b7724dafc3b in ImplYield(bool, bool) /vcl/source/app/svapp.cxx:471:28 > #25 0x2b7724d8a3ff in Application::Yield() /vcl/source/app/svapp.cxx:536:5 [...] Change-Id: I1650c2236a183c7b6349be6cb444d350e85ea8b6 Reviewed-on: https://gerrit.libreoffice.org/60654 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 46dea0e3f124..7b79ec56beb8 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -521,7 +521,7 @@ sal_uInt8 GetColorValue( double nVal, double nVal1, sal_uInt8 nColVal1, double n if (nVal >= nVal2) return nColVal2; -sal_uInt8 nColVal = static_cast((nVal - nVal1)/(nVal2-nVal1)*(nColVal2-nColVal1))+nColVal1; +sal_uInt8 nColVal = static_cast((nVal - nVal1)/(nVal2-nVal1)*(nColVal2-nColVal1))+nColVal1; return nColVal; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/txtflde.cxx | 13 ++---
1 file changed, 2 insertions(+), 11 deletions(-)
New commits:
commit 36f2df8a32429ac3f3c91203c39a87003003260e
Author: Arkadiy Illarionov
AuthorDate: Mon Sep 17 19:10:07 2018 +0300
Commit: Noel Grandin
CommitDate: Tue Sep 18 08:31:45 2018 +0200
Replace manual copying with comphelper::containerToSequence
30530afaaa715473a2f9c3f068beeed5f3a98daf follow-up
Change-Id: I74082858c938087c5698ef0948a72b9a61b9127c
Reviewed-on: https://gerrit.libreoffice.org/60593
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index ba5bba24ac6a..d607e15540dd 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -63,6 +63,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1922,17 +1923,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
if (aMapIter != pUsedMasters->end())
{
// found the set of used field masters
-set & rOurMasters = aMapIter->second;
-
-// copy set to sequence
-aFieldMasters.realloc( rOurMasters.size() );
-sal_Int32 i = 0;
-for( const auto& rMaster : rOurMasters )
-{
-aFieldMasters[i] = rMaster;
-++i;
-}
-
+aFieldMasters =
comphelper::containerToSequence(aMapIter->second);
pUsedMasters->erase(rText);
}
// else: XText not found -> ignore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf118691.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 12
writerfilter/source/ooxml/model.xml |4 ++--
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit f63a60f56156e4ac17887e6c96d15fb865a2a8eb
Author: László Németh
AuthorDate: Mon Sep 17 13:36:09 2018 +0200
Commit: László Németh
CommitDate: Tue Sep 18 08:05:12 2018 +0200
tdf#118691 DOCX import: fix table loss caused by
According to the OOXML standard, (carriage return –
Unicode character 000D) is equivalent to a break
with null type and clear attributes, so we handle it as
a , instead of endOfParagraph, fixing
losing table paragraphs and tables containing .
Note: It seems, MSO cannot handle carriage return characters
in table cells correctly. It shows squares (unknown
characters) without line break there. Copying this text to
a non-table paragraph in MSO, we get the correct layout with
line breaks. Copying this text with carriage return characters
back to a table cell, we get squares again. With this LO fix,
it will be possible to fix the bad tables edited by MS Word
by using LO, because LibreOffice import/export converts all
s to s (as before, but now without destroying
the structure of the tables).
Change-Id: Iee42f71e9a00531353582e7127c2c212ea0890d0
Reviewed-on: https://gerrit.libreoffice.org/60585
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118691.docx
b/sw/qa/extras/ooxmlexport/data/tdf118691.docx
new file mode 100644
index ..ce6c6c5cf76d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf118691.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 9d0c9fa829ee..1849d05cb008 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -731,6 +731,18 @@
DECLARE_OOXMLEXPORT_TEST(testTrackChangesEmptyParagraphsInADeletion, "testTrackC
assertXPath(pXmlDoc, "/w:document/w:body/w:p[" + OString::number(i) +
"]/w:pPr/w:rPr/w:del");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables(),
+uno::UNO_QUERY);
+// Text "Before" stays in the first cell, not removed before the table
because of
+// bad handling of
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Before\nAfter"), xCell->getString());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 36328c035d75..e1640c44e54d 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17942,8 +17942,8 @@
-
-
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/comphelper sd/source
include/comphelper/weak.hxx|5 +
sd/source/ui/inc/ViewShell.hxx |2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5571d3c8621e18a3bea527da807b7b99d19ec409
Author: Stephan Bergmann
AuthorDate: Mon Sep 17 22:18:46 2018 +0200
Commit: Stephan Bergmann
CommitDate: Tue Sep 18 07:32:54 2018 +0200
CppunitTest_sd_dialogs_test needs sd::ViewShell::GetFrameWeld
...since 88582ebee383c63c3fba588924f36ff7655af9c1 "weld SdCharDlg"
Change-Id: Id6069271806e1a19688debf045169890e557cc66
Reviewed-on: https://gerrit.libreoffice.org/60645
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 9596a8d7155d..aee6057b9977 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -152,7 +152,7 @@ public:
show running then the active window is a ShowWindow.
*/
::sd::Window* GetActiveWindow() const { return mpActiveWindow;}
-weld::Window* GetFrameWeld() const;
+SD_DLLPUBLIC weld::Window* GetFrameWeld() const;
/** Set the active window. When the shell is displayed in the center
pane then the window of the ViewShellBase is also set to the given
commit 2f6bd6799c0b43afa6e01925456054082c6968be
Author: Stephan Bergmann
AuthorDate: Mon Sep 17 22:14:46 2018 +0200
Commit: Stephan Bergmann
CommitDate: Tue Sep 18 07:32:41 2018 +0200
-Werror=deprecated-copy (GCC trunk towards GCC 9)
...after 27463197176fd7f68cbdeed790621dad6b4c63d3 "clang-tidy bugprone-copy-
constructor-init" made e.g. the SfxStyleSheetBase copy ctor (in
svl/source/items/style.cxx) use the copy instead of the default ctor for its
OWeakTypeObject sub-object
Change-Id: I7deec4ea2f968587ba1dc03e33206cecfa3f8df5
Reviewed-on: https://gerrit.libreoffice.org/60644
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 1a9c99f2324d..929ecbf495ca 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -40,6 +40,11 @@ public:
OWeakTypeObject();
virtual ~OWeakTypeObject() override;
+OWeakTypeObject(OWeakTypeObject const &) = default;
+OWeakTypeObject(OWeakTypeObject &&) = default;
+OWeakTypeObject & operator =(OWeakTypeObject const &) = default;
+OWeakTypeObject & operator =(OWeakTypeObject &&) = default;
+
virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & rType
) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source
i18npool/source/localedata/data/da_DK.xml | 664 +-- i18npool/source/localedata/data/kab_DZ.xml | 710 ++--- 2 files changed, 687 insertions(+), 687 deletions(-) New commits: commit 8dae0020b7f2fd25df6528cd86590ef30257d5d3 Author: Matthias Seidel AuthorDate: Mon Sep 17 21:12:15 2018 + Commit: Matthias Seidel CommitDate: Mon Sep 17 21:12:15 2018 + Replace tabs with spaces diff --git a/i18npool/source/localedata/data/da_DK.xml b/i18npool/source/localedata/data/da_DK.xml index 2dc62d7c7655..5f8ea9942273 100644 --- a/i18npool/source/localedata/data/da_DK.xml +++ b/i18npool/source/localedata/data/da_DK.xml @@ -21,336 +21,336 @@ * ***--> - - -da -Danish - - -DK -Denmark - - - - -- -. -, -: -, -; - -. - - - - -’ -’ -” -” - -AM -PM -metric - - - -Standard - - -0 - - -0,00 - - -#.##0 - - -#.##0,00 - - -#.###,00 - - -0,00E+000 - - -0,00E+00 - - -0% - - -0,00% - - -[$kr-406] #.##0;[$kr-406] -#.##0 - - -[$kr-406] #.##0,00;[$kr-406] -#.##0,00 - - -[$kr-406] #.##0;[RED][$kr-406] -#.##0 - - -[$kr-406] #.##0,00;[RED][$kr-406] -#.##0,00 - - -#.##0,00 CCC - - -[$kr-406] #.##0,--;[RED][$kr-406] -#.##0,-- - - -DD-MM-YY - - -D. - - -DD-MM-YY - - -DD-MM- - - -D. MMM YY - - -D. MMM - - -D. MMM. - - -D. - - -D. - - -NN D. MMM YY - - -NN DD-MMM YY - - -NN D. - - -D. - - -MM-DD - - -YY-MM-DD -ISO 8601 (EN 28601) - - --MM-DD -ISO 8601 (EN 28601) - - -MM-YY - - -DD-MMM - - - - - -QQ YY - - -WW - - -TT:MM - - -TT:MM:SS - - -TT:MM AM/PM - - -TT:MM:SS AM/PM - - -[TT]:MM:SS - - -MM:SS,00 - - -[TT]:MM:SS,00 - - -DD-MM-YY TT:MM - - -DD-MM- TT:MM:SS - - - - - -A-Z Æ Ø Å -0 -1 -2 -f. -ff. - - - - - -sun -søn -søndag - - -mon -man -mandag - - -tue -tir -tirsdag - - -wed -ons -onsdag - - -thu -tor -torsdag - - -fri -fre -fredag - - -sat -lør -lørdag - - - - -jan -jan -januar - - -feb -feb -februar - - -mar -mar -marts - - -apr -apr -april - - -may -maj -maj - - -jun -
[Libreoffice-commits] core.git: solenv/CompilerTest_compilerplugins_clang.mk
solenv/CompilerTest_compilerplugins_clang.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2a525b00c9ea15408fb64dcb6749405739f58ab Author: Stephan Bergmann AuthorDate: Mon Sep 17 18:37:37 2018 +0200 Commit: Stephan Bergmann CommitDate: Mon Sep 17 23:00:41 2018 +0200 compilerplugins/clang/test/constfields doesn't work for clang-cl ...because loplugin:constfields is wrapped in #if !defined _WIN32 //TODO, #include Change-Id: I9b2a72ecd31f561c71be5a74a752344c24d40f26 Reviewed-on: https://gerrit.libreoffice.org/60598 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/solenv/CompilerTest_compilerplugins_clang.mk b/solenv/CompilerTest_compilerplugins_clang.mk index 89085c5e4a8f..e187f374f915 100644 --- a/solenv/CompilerTest_compilerplugins_clang.mk +++ b/solenv/CompilerTest_compilerplugins_clang.mk @@ -14,7 +14,7 @@ $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \ compilerplugins/clang/test/blockblock \ compilerplugins/clang/test/casttovoid \ compilerplugins/clang/test/commaoperator \ -compilerplugins/clang/test/constfields \ +$(if $(filter-out WNT,$(OS)),compilerplugins/clang/test/constfields) \ compilerplugins/clang/test/constparams \ compilerplugins/clang/test/convertlong \ compilerplugins/clang/test/cppunitassertequals \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 59273adf87a7fa0bbf9e0ba40fe8d4f91f0a77a0 Author: Olivier Hallot AuthorDate: Mon Sep 17 15:49:13 2018 -0300 Commit: Gerrit Code Review CommitDate: Mon Sep 17 22:49:12 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are'nt working 31 Module cui Change-Id: I3f9dc6e469b04f0e86c426c907a8213fe351b8c4 Reviewed-on: https://gerrit.libreoffice.org/60636 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1a2860a365e8..b51008a35b85 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1a2860a365e81a2bf707f374ac6c36699a03981d +Subproject commit b51008a35b852dab0ba0d50903b174824891b420 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0010.xhp| 10 +++--- source/text/shared/00/0101.xhp|1 source/text/shared/00/0105.xhp|1 source/text/shared/01/0207.xhp|1 source/text/shared/01/02100100.xhp|1 source/text/shared/01/02100200.xhp|1 source/text/shared/01/0218.xhp|1 source/text/shared/01/02210101.xhp|1 source/text/shared/01/02220100.xhp|1 source/text/shared/01/02230300.xhp|1 source/text/shared/01/0410.xhp|1 source/text/shared/01/04150100.xhp|1 source/text/shared/01/05020100.xhp|1 source/text/shared/01/05020200.xhp|1 source/text/shared/01/05020300.xhp|1 source/text/shared/01/05020500.xhp|1 source/text/shared/01/05020600.xhp|1 source/text/shared/01/05020700.xhp|1 source/text/shared/01/05030100.xhp| 23 +++--- source/text/shared/01/05030300.xhp|9 +++-- source/text/shared/01/05030500.xhp|6 ++- source/text/shared/01/05030600.xhp|1 source/text/shared/01/05030700.xhp| 11 +++--- source/text/shared/01/05030800.xhp|3 + source/text/shared/01/05040200.xhp|3 + source/text/shared/01/05100200.xhp|7 ++-- source/text/shared/01/0519.xhp|1 source/text/shared/01/05190100.xhp|4 +- source/text/shared/01/05200100.xhp|4 +- source/text/shared/01/05200200.xhp|2 + source/text/shared/01/05200300.xhp|7 ++-- source/text/shared/01/0521.xhp|3 + source/text/shared/01/05210100.xhp|1 source/text/shared/01/05210300.xhp|7 ++-- source/text/shared/01/05210400.xhp|7 ++-- source/text/shared/01/05210500.xhp|7 ++-- source/text/shared/01/05210600.xhp|3 + source/text/shared/01/05210700.xhp|3 + source/text/shared/01/0522.xhp|1 source/text/shared/01/05230100.xhp|3 + source/text/shared/01/05230300.xhp|1 source/text/shared/01/05230400.xhp|3 + source/text/shared/01/05230500.xhp|1 source/text/shared/01/0532.xhp|4 +- source/text/shared/01/05340300.xhp|1 source/text/shared/01/0536.xhp|3 + source/text/shared/01/0601.xhp|1 source/text/shared/01/0602.xhp|1 source/text/shared/01/06040100.xhp|2 + source/text/shared/01/06040200.xhp|1 source/text/shared/01/06040300.xhp|1 source/text/shared/01/06040400.xhp|1 source/text/shared/01/06040600.xhp|1 source/text/shared/01/06040700.xhp|1 source/text/shared/01/06050100.xhp|7 ++-- source/text/shared/01/06050200.xhp|7 ++-- source/text/shared/01/06050300.xhp|3 + source/text/shared/01/06050400.xhp|7 ++-- source/text/shared/01/06050500.xhp| 29 +- source/text/shared/01/06050600.xhp|1 source/text/shared/01/0613.xhp|2 + source/text/shared/01/06140100.xhp|1 source/text/shared/01/06140102.xhp|1 source/text/shared/01/06140200.xhp|1 source/text/shared/01/06140402.xhp|1 source/text/shared/01/06140500.xhp|2 + source/text/shared/01/0620.xhp|3 + source/text/shared/01/06201000.xhp|5 ++- source/text/shared/01/06202000.xhp|1 source/text/shared/01/gallery_files.xhp |5 +-- source/text/shared/02/01170004.xhp|4 +- source/text/shared/02/09070100.xhp|8 +++- source/text/shared/02/09070200.xhp|4 +- source/text/shared/02/09070300.xhp|4 +- source/text/shared/02/09070400.xhp|4 +- source/text/shared/02/2401.xhp|6 +++ source/text/shared/guide/edit_symbolbar.xhp |1 source/text/shared/opt
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/fntcache.cxx | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit 570f3c12fdb9db523cdef15c7a03cff82bd8ec15 Author: Miklos Vajna AuthorDate: Mon Sep 17 17:39:50 2018 +0200 Commit: Miklos Vajna CommitDate: Mon Sep 17 22:43:39 2018 +0200 tdf#119820 sw: optimize SwTextGlyphsKey comparison Import time before: 12.192 seconds After: 5.836 seconds (47.87% of baseline) for me. Change-Id: Ifd650addaae3fe25b45cf0fd452f78372e60c467 Reviewed-on: https://gerrit.libreoffice.org/60591 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 5f294fe6c7ca..bf98f097ec47 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -135,10 +135,6 @@ bool operator<(const SwTextGlyphsKey& l, const SwTextGlyphsKey& r) return true; if (l.m_pOutputDevice.get() > r.m_pOutputDevice.get()) return false; -if (l.m_aText < r.m_aText) -return true; -if (l.m_aText > r.m_aText) -return false; if (l.m_nIndex < r.m_nIndex) return true; if (l.m_nIndex > r.m_nIndex) @@ -147,6 +143,15 @@ bool operator<(const SwTextGlyphsKey& l, const SwTextGlyphsKey& r) return true; if (l.m_nLength > r.m_nLength) return false; + +// Comparing strings is expensive, so compare them only at the end, and +// only once. +sal_Int32 nRet = l.m_aText.compareTo(r.m_aText); +if (nRet < 0) +return true; +if (nRet > 0) +return false; + return false; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/02010101.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a2860a365e81a2bf707f374ac6c36699a03981d Author: Andrea Gelmini AuthorDate: Mon Sep 17 20:35:03 2018 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Sep 17 22:23:57 2018 +0200 Fix typo Change-Id: I2219e81ed03a92ea5ff4cff3e494a7c483d16cec Reviewed-on: https://gerrit.libreoffice.org/60634 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/explorer/database/02010101.xhp b/source/text/shared/explorer/database/02010101.xhp index 934764bf7..f55468450 100644 --- a/source/text/shared/explorer/database/02010101.xhp +++ b/source/text/shared/explorer/database/02010101.xhp @@ -58,6 +58,6 @@ Full Join In a full join, the results table contains all records of the queried fields from the left and right tables. In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command. Natural - In a nautral join, the keyword NATURAL in inserted into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns. + In a natural join, the keyword NATURAL in inserted into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a7ba34eb52ea919454b8f58a2d9de87229e6e83 Author: Andrea Gelmini AuthorDate: Mon Sep 17 20:35:03 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Sep 17 22:23:57 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix typo Change-Id: I2219e81ed03a92ea5ff4cff3e494a7c483d16cec Reviewed-on: https://gerrit.libreoffice.org/60634 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index f7606a55bb58..1a2860a365e8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f7606a55bb58a5c30dce04427340719856e66ac9 +Subproject commit 1a2860a365e81a2bf707f374ac6c36699a03981d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source embeddedobj/source embedserv/source vcl/win winaccessibility/source xmlsecurity/source
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |1 -
connectivity/source/drivers/ado/ADriver.cxx |2 +-
connectivity/source/drivers/ado/AResultSet.cxx |3 ---
embeddedobj/source/msole/olemisc.cxx |1 -
embedserv/source/embed/docholder.cxx |2 +-
vcl/win/gdi/salfont.cxx |1 -
winaccessibility/source/UAccCOM/EnumVariant.h|3 +--
winaccessibility/source/service/AccObjectWinManager.cxx |2 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx |2 --
9 files changed, 4 insertions(+), 13 deletions(-)
New commits:
commit 590e44c802d7809a3a4cfb71a5fa9603aff39bd9
Author: Stephan Bergmann
AuthorDate: Mon Sep 17 18:35:42 2018 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 17 22:22:24 2018 +0200
loplugin:simplifyconstruct (clang-cl)
Change-Id: I7cae6b3f31b10efc72884bce4bda7bf6b380cbc2
Reviewed-on: https://gerrit.libreoffice.org/60597
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index d787532336a1..2f8a0f96f353 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -53,7 +53,6 @@
ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet
,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
,m_aStatement(nullptr)
-,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bWasNull(false)
,m_bEOF(false)
diff --git a/connectivity/source/drivers/ado/ADriver.cxx
b/connectivity/source/drivers/ado/ADriver.cxx
index d1217a6caa18..934c3a2a47ea 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -215,7 +215,7 @@ Reference< XTablesSupplier > SAL_CALL
ODriver::getDataDefinitionByConnection( co
}
-Reference< XTablesSupplier > xTab = nullptr;
+Reference< XTablesSupplier > xTab;
if(pConnection)
{
WpADOCatalog aCatalog;
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx
b/connectivity/source/drivers/ado/AResultSet.cxx
index 8c1b6993dabe..4a1753f8e853 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -74,7 +74,6 @@ OResultSet::OResultSet(ADORecordset*
_pRecordSet,OStatement_Base* pStmt) : ORes
,m_pRecordSet(_pRecordSet)
,m_pStmt(pStmt)
,m_xStatement(*pStmt)
-,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bEOF(false)
,m_bOnFirstAfterOpen(false)
@@ -85,8 +84,6 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet) :
OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
,m_pStmt(nullptr)
-,m_xStatement(nullptr)
-,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bEOF(false)
,m_bOnFirstAfterOpen(false)
diff --git a/embeddedobj/source/msole/olemisc.cxx
b/embeddedobj/source/msole/olemisc.cxx
index 02f2e14ac39b..83485c89d768 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -107,7 +107,6 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference<
lang::XMultiServiceF
// this constructor let object be initialized from clipboard
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference<
lang::XMultiServiceFactory >& xFactory )
: m_pOleComponent( nullptr )
-, m_pInterfaceContainer( nullptr )
, m_bReadOnly( false )
, m_bDisposed( false )
, m_nObjectState( -1 )
diff --git a/embedserv/source/embed/docholder.cxx
b/embedserv/source/embed/docholder.cxx
index 0efc380843b9..03131f36896c 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1205,7 +1205,7 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL
DocumentHolder::getContainerWin
if(m_xContainerWindow.is())
return m_xContainerWindow;
-uno::Reference xWin(nullptr);
+uno::Reference xWin;
uno::Reference xToolkit = awt::Toolkit::create(
comphelper::getComponentContext(m_xFactory) );
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 6b50e55433f2..fdecd037 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -620,7 +620,6 @@ WinFontFace::WinFontFace( const FontAttributes& rDFS,
: PhysicalFontFace( rDFS ),
mnId( 0 ),
mbFontCapabilitiesRead( f
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/gdiimpl.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit cb1f0bebf80be925927028f90f8b631c9ad51e53 Author: Stephan Bergmann AuthorDate: Mon Sep 17 18:29:10 2018 +0200 Commit: Stephan Bergmann CommitDate: Mon Sep 17 22:21:47 2018 +0200 -Werror,-Wshadow (clang-cl) Change-Id: I14040fd236d399bfce6c4e6e6927a00aabe5b2c5 Reviewed-on: https://gerrit.libreoffice.org/60595 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 0134c9ab63e5..0fde7b510486 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -2139,7 +2139,6 @@ bool WinSalGraphicsImpl::drawPolyLine( const Gdiplus::Color aTestColor(aTrans, maLineColor.GetRed(), maLineColor.GetGreen(), maLineColor.GetBlue()); Gdiplus::Pen aPen(aTestColor.GetValue(), Gdiplus::REAL(rLineWidths.getX())); bool bNoLineJoin(false); -Gdiplus::Matrix aMatrix; // Set full (Object-to-Device) transformation - if used if(rObjectToDevice.isIdentity()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appdde.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit f13c2ce1879182331b2cb57066e23b7a3fc0eb83 Author: Stephan Bergmann AuthorDate: Mon Sep 17 18:31:59 2018 +0200 Commit: Stephan Bergmann CommitDate: Mon Sep 17 22:22:06 2018 +0200 Missing include (Windows, --disable-pch) Change-Id: I825230daf223ff94ab1dbc19d81d478fbf464f56 Reviewed-on: https://gerrit.libreoffice.org/60596 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index a35339e2784b..bec2b5cbf825 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include ___ 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/sdr/properties/captionproperties.cxx |5 ++---
svx/source/sdr/properties/circleproperties.cxx |7 +++
svx/source/sdr/properties/connectorproperties.cxx |5 ++---
svx/source/sdr/properties/customshapeproperties.cxx |2 +-
svx/source/sdr/properties/graphicproperties.cxx |7 +++
svx/source/sdr/properties/measureproperties.cxx |8
svx/source/sdr/properties/rectangleproperties.cxx |5 ++---
svx/source/sdr/properties/textproperties.cxx|5 ++---
8 files changed, 19 insertions(+), 25 deletions(-)
New commits:
commit 1fb121ef93325278fb2c9e417c47a5902c4b6033
Author: Armin Le Grand
AuthorDate: Mon Sep 17 11:28:13 2018 +0200
Commit: Armin Le Grand
CommitDate: Mon Sep 17 21:11:28 2018 +0200
In ::SetStyleSheet implementations call parent first
This will guarantee SfxItemSet existence
Change-Id: Ia969b5391c7b20d3a2bbba4376a16fcaadccb9d4
Reviewed-on: https://gerrit.libreoffice.org/60563
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/svx/source/sdr/properties/captionproperties.cxx
b/svx/source/sdr/properties/captionproperties.cxx
index 5e7d2d3304f6..301b804e4bc6 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -77,12 +77,11 @@ namespace sdr
void CaptionProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet,
bool bDontRemoveHardAttr)
{
-SdrCaptionObj& rObj = static_cast(GetSdrObject());
-
-// call parent
+// call parent (always first thing to do, may create the
SfxItemSet)
RectangleProperties::SetStyleSheet(pNewStyleSheet,
bDontRemoveHardAttr);
// local changes
+SdrCaptionObj& rObj = static_cast(GetSdrObject());
rObj.ImpRecalcTail();
}
diff --git a/svx/source/sdr/properties/circleproperties.cxx
b/svx/source/sdr/properties/circleproperties.cxx
index e0469fb3e2c9..ba874bb4ca4d 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -81,14 +81,13 @@ namespace sdr
void CircleProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet,
bool bDontRemoveHardAttr)
{
-SdrCircObj& rObj = static_cast(GetSdrObject());
+// call parent (always first thing to do, may create the
SfxItemSet)
+RectangleProperties::SetStyleSheet(pNewStyleSheet,
bDontRemoveHardAttr);
// local changes
+SdrCircObj& rObj = static_cast(GetSdrObject());
rObj.SetXPolyDirty();
-// call parent
-RectangleProperties::SetStyleSheet(pNewStyleSheet,
bDontRemoveHardAttr);
-
// local changes
rObj.ImpSetAttrToCircInfo();
}
diff --git a/svx/source/sdr/properties/connectorproperties.cxx
b/svx/source/sdr/properties/connectorproperties.cxx
index e8847dcc9ab6..e8e63311916b 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -78,12 +78,11 @@ namespace sdr
void ConnectorProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet,
bool bDontRemoveHardAttr)
{
-SdrEdgeObj& rObj = static_cast(GetSdrObject());
-
-// call parent
+// call parent (always first thing to do, may create the
SfxItemSet)
TextProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
// local changes
+SdrEdgeObj& rObj = static_cast(GetSdrObject());
rObj.ImpSetAttrToEdgeInfo();
}
} // end of namespace properties
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx
b/svx/source/sdr/properties/customshapeproperties.cxx
index 4a1d5dd0df09..849681f8d915 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -165,7 +165,7 @@ namespace sdr
void CustomShapeProperties::SetStyleSheet(SfxStyleSheet*
pNewStyleSheet, bool bDontRemoveHardAttr)
{
-// call parent
+// call parent (always first thing to do, may create the
SfxItemSet)
TextProperties::SetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr
);
// update bTextFrame and RenderGeometry
diff --git a/svx/source/sdr/properties/graphicproperties.cxx
b/svx/source/sdr/properties/graphicproperties.cxx
index 9097857b2827..0ef07cfd8c5e 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -106,14 +106,13 @@ namespace sdr
void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet,
bool bDontRemoveHardAttr)
{
-SdrGrafObj& rObj = static_cast(GetSdrObject());
+// call parent (always first thing to do, may create the
SfxItemSet)
+RectangleProperties::SetStyl
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui| 50 ++-- sd/uiconfig/simpress/ui/notebookbar.ui | 137 ++--- sw/uiconfig/swriter/ui/notebookbar.ui | 34 3 files changed, 118 insertions(+), 103 deletions(-) New commits: commit a9b36a9cb9e3d5d28f322070afdae2eb12e5ba23 Author: andreas kainz AuthorDate: Mon Sep 17 00:56:30 2018 +0200 Commit: andreas_kainz CommitDate: Mon Sep 17 20:59:47 2018 +0200 NB sync draw shapes between apps Change-Id: Ibb1e11eb438607d26ebd06e7fb160cf850915d5b Reviewed-on: https://gerrit.libreoffice.org/60555 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 7f4df60cbd3e..5f331d60e864 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -4973,7 +4973,7 @@ -+ @@ -5022,7 +5022,7 @@ - + @@ -5032,7 +5032,7 @@ - + True False center @@ -5047,10 +5047,10 @@ False 3 - + True False -.uno:DrawText +.uno:Text False @@ -5145,10 +5145,10 @@ - + True False -.uno:BasicShapes.round-rectangle +.uno:BasicShapes.ellipse True @@ -5156,10 +5156,10 @@ - + True False -.uno:BasicShapes.ellipse +.uno:DrawCaption True @@ -5203,11 +5203,11 @@ False True 5 -2 +3 - + @@ -5217,19 +5217,19 @@ - + True False center True - + True False center vertical - + True False @@ -5244,7 +5244,7 @@ - + True False .uno:SymbolShapes @@ -5255,7 +5255,7 @@ - + True False .uno:ArrowShapes @@ -5273,
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/page.cxx | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
New commits:
commit f717cf15d3dc8f4cebffba8a6673273c1d4a549c
Author: Jochen Nitschke
AuthorDate: Sun Sep 16 18:36:22 2018 +0200
Commit: Jochen Nitschke
CommitDate: Mon Sep 17 20:47:29 2018 +0200
remove ancient PRINT_OFFSET
it's useless since
commit c30e0cd9948e721e114d1233daca14ec9496bcd2
Date: Wed Apr 10 11:33:37 2002 +
#97886# remove unnecessary page border offset
Change-Id: I89c7d4514ff212c62c6e681739ff3dfe0f04f633
Reviewed-on: https://gerrit.libreoffice.org/60553
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index db3b1977d39d..be2f6ff317f2 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -60,8 +60,6 @@
// static
static const long MINBODY = 284; // 0,5 cm rounded up in twips
-//static const long PRINT_OFFSET= 17; // 0,03 cm rounded down in twips
-static const long PRINT_OFFSET = 0;// why was this ever set to 17 ? it
led to wrong right and bottom margins.
const sal_uInt16 SvxPageDescPage::pRanges[] =
{
@@ -266,11 +264,10 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent,
const SfxItemSet& rAttr)
Point aPrintOffset = mpDefPrinter->GetPageOffset() -
mpDefPrinter->PixelToLogic( Point() );
mpDefPrinter->SetMapMode( aOldMode );
-long nOffset = !aPrintOffset.X() && !aPrintOffset.Y() ? 0 : PRINT_OFFSET;
nFirstLeftMargin =
m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(aPrintOffset.X()),
FUNIT_TWIP);
-nFirstRightMargin =
m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPaperSize.Width()
- aPrintSize.Width() - aPrintOffset.X() + nOffset), FUNIT_TWIP);
+nFirstRightMargin =
m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPaperSize.Width()
- aPrintSize.Width() - aPrintOffset.X()), FUNIT_TWIP);
nFirstTopMargin =
m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(aPrintOffset.Y()
), FUNIT_TWIP);
-nFirstBottomMargin =
m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(aPaperSize.Height()
- aPrintSize.Height() - aPrintOffset.Y() + nOffset), FUNIT_TWIP );
+nFirstBottomMargin =
m_xBottomMarginEdit->convert_value_from(m_xBottomMarginEdit->normalize(aPaperSize.Height()
- aPrintSize.Height() - aPrintOffset.Y()), FUNIT_TWIP );
nLastLeftMargin =
m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(aPrintOffset.X()
+ aPrintSize.Width()), FUNIT_TWIP);
nLastRightMargin =
m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(aPrintOffset.X()
+ aPrintSize.Width()), FUNIT_TWIP);
nLastTopMargin =
m_xTopMarginEdit->convert_value_from(m_xTopMarginEdit->normalize(aPrintOffset.Y()
+ aPrintSize.Height()), FUNIT_TWIP);
@@ -965,13 +962,10 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
sal_Int64 nSetB = m_xBottomMarginEdit->denormalize(
m_xBottomMarginEdit->get_value( FUNIT_TWIP ) );
-long nOffset = !aPrintOffset.X() && !aPrintOffset.Y() ? 0 : PRINT_OFFSET;
long nNewL = aPrintOffset.X();
-long nNewR =
-aPaperSize.Width() - aPrintSize.Width() - aPrintOffset.X() + nOffset;
+long nNewR = aPaperSize.Width() - aPrintSize.Width() - aPrintOffset.X();
long nNewT = aPrintOffset.Y();
-long nNewB =
-aPaperSize.Height() - aPrintSize.Height() - aPrintOffset.Y() + nOffset;
+long nNewB = aPaperSize.Height() - aPrintSize.Height() - aPrintOffset.Y();
nFirstLeftMargin =
m_xLeftMarginEdit->convert_value_from(m_xLeftMarginEdit->normalize(nNewL),
FUNIT_TWIP);
nFirstRightMargin =
m_xRightMarginEdit->convert_value_from(m_xRightMarginEdit->normalize(nNewR),
FUNIT_TWIP);
___
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-5.3' - sc/qa sc/source
sc/qa/unit/data/xlsx/tdf41425.xlsx|binary
sc/qa/unit/subsequent_export-test.cxx | 15 +++
sc/source/filter/excel/xetable.cxx|3 +++
3 files changed, 18 insertions(+)
New commits:
commit f9df3478ace3fb3ea25d24c7bc8b6b72cd7f1729
Author: László Németh
AuthorDate: Fri Aug 3 16:11:16 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 17 18:36:39 2018 +0200
tdf#41425 XLS/XLSX export: workaround for style and validation loss
of cells of blank rows.
This workaround is probably a fix for problems of most users, but for
a full solution it needs to extend the workaround for all rows with not
default settings, also avoiding of the possible performance problems.
Note: the number 1000 of the extra rows came from a similar workaround used
in
XLSX export of Google Spreadsheets, but instead of listing extra empty 1000
rows in OOXML, this fix writes only the cells with not default settings from
the extra 1000 blank rows.
Reviewed-on: https://gerrit.libreoffice.org/58575
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 99b9ea63bfc9a5fe63a0cd7b30b66ce2c1bde08e)
Reviewed-on: https://gerrit.libreoffice.org/58812
Reviewed-by: Christian Lohmaier
(cherry picked from commit d7cbaac61b8f3575184c675a760907c3b4bb225e)
Change-Id: Icac9441b7eb1520dcd20fc04337e070d070591c7
diff --git a/sc/qa/unit/data/xlsx/tdf41425.xlsx
b/sc/qa/unit/data/xlsx/tdf41425.xlsx
new file mode 100644
index ..f7d3ec9ed6ec
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf41425.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 793b239d510d..36b3e9c8fd15 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -220,6 +220,7 @@ public:
void testPivotTableOutlineModeXLSX();
void testPivotTableDuplicatedMemberFilterXLSX();
void testPivotTableTabularModeXLSX();
+void testKeepSettingsOfBlankRows();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -339,6 +340,7 @@ public:
CPPUNIT_TEST(testPivotTableOutlineModeXLSX);
CPPUNIT_TEST(testPivotTableDuplicatedMemberFilterXLSX);
CPPUNIT_TEST(testPivotTableTabularModeXLSX);
+CPPUNIT_TEST(testKeepSettingsOfBlankRows);
CPPUNIT_TEST_SUITE_END();
@@ -5262,6 +5264,19 @@ void ScExportTest::testPivotTableTabularModeXLSX()
assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]", "outline", "0");
}
+void ScExportTest::testKeepSettingsOfBlankRows()
+{
+ScDocShellRef xDocSh = loadDoc("tdf41425.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.Is());
+
+std::shared_ptr pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pSheet);
+
+// saved blank row with not default setting in A2
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row", 2);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 29257f2df5ed..12e5afc0b5a7 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2463,6 +2463,9 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot
) :
if(nLastUsedScCol > nMaxScCol)
nLastUsedScCol = nMaxScCol;
+// check extra blank rows to avoid of losing their not default settings
(workaround for tdf#41425)
+nLastUsedScRow += 1000;
+
if(nLastUsedScRow > nMaxScRow)
nLastUsedScRow = nMaxScRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: clang-8: error: unknown argument: '-flto-partition=none' when building lxml
> uses $$CFLAGS (i.e., whathever the CFLAGS env var is set to in the shell run by `make`) It's not coming from shell CFLAGS. I have searched all shell and environment variables with: $( set -o posix ; set ) | less And nothing has a '-flto-partition=none' Any other ideas on where to find this or how to override it? This is definitely distro specific, as Ubuntu still works fine. Also, it was a fairly recent change in Arch. Could it have happened when I upgraded gcc, or if not what might it be? Thanks, -Luke ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: net/FakeSocket.cpp net/FakeSocket.hpp
net/FakeSocket.cpp | 123 -
net/FakeSocket.hpp |4 -
2 files changed, 69 insertions(+), 58 deletions(-)
New commits:
commit 53416a290dbb6f83c688aed4d94bf3e91d53a812
Author: Tor Lillqvist
AuthorDate: Mon Sep 17 20:39:53 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Sep 17 20:44:18 2018 +0300
Add fakeSocketShutdown() and drop fakeSocketFeed()
Not sure whether the shutdown() implementation matches real shutdown()
semantics, especially with regards to the behaviour of poll(), read(),
and write() (on both the socket itself and the connectd one)
afterwards. But let's see.
The feed() API turned out to be not needed. (And in any case, it was
suposed to be completely equivalent to writing to the peer socket.)
diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 37bfe7a7c..8dc214ae9 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -44,6 +44,7 @@ struct FakeSocketPair
int fd[2];
bool listening;
int connectingFd;
+bool shutdown[2];
bool readable[2];
std::vector buffer[2];
std::mutex *mutex;
@@ -54,6 +55,8 @@ struct FakeSocketPair
fd[1] = -1;
listening = false;
connectingFd = -1;
+shutdown[0] = false;
+shutdown[1] = false;
readable[0] = false;
readable[1] = false;
mutex = new std::mutex();
@@ -104,11 +107,6 @@ int fakeSocketSocket()
FakeSocketPair& result = fds[i];
result.fd[0] = i*2;
-result.fd[1] = -1;
-result.listening = false;
-result.connectingFd = -1;
-result.buffer[0].resize(0);
-result.buffer[1].resize(0);
loggingBuffer << "FakeSocket Create " << i*2 << flush();
@@ -187,17 +185,28 @@ static bool checkForPoll(std::vector&
fds, struct pollfd *pollfd
bool retval = false;
for (int i = 0; i < nfds; i++)
{
-// Caller sets POLLNVAL for invalid fds.
-if (pollfds[i].revents != POLLNVAL)
+const int K = ((pollfds[i].fd)&1);
+const int N = 1 - K;
+
+if (pollfds[i].fd < 0 || pollfds[i].fd/2 >= fds.size())
+{
+pollfds[i].revents = POLLNVAL;
+}
+else
{
-pollfds[i].revents = 0;
const int K = ((pollfds[i].fd)&1);
-const int N = 1 - K;
+if (fds[pollfds[i].fd/2].fd[K] == -1)
+pollfds[i].revents = POLLNVAL;
+else
+pollfds[i].revents = 0;
+}
+
+if (pollfds[i].revents == 0)
+{
if (pollfds[i].events & POLLIN)
{
-if (fds[pollfds[i].fd/2].fd[K] != -1 &&
-(fds[pollfds[i].fd/2].readable[K] ||
- (K == 0 && fds[pollfds[i].fd/2].listening &&
fds[pollfds[i].fd/2].connectingFd != -1)))
+if (fds[pollfds[i].fd/2].readable[K] ||
+(K == 0 && fds[pollfds[i].fd/2].listening &&
fds[pollfds[i].fd/2].connectingFd != -1))
{
pollfds[i].revents |= POLLIN;
retval = true;
@@ -207,7 +216,7 @@ static bool checkForPoll(std::vector& fds,
struct pollfd *pollfd
// open and not readable.
if (pollfds[i].events & POLLOUT)
{
-if (fds[pollfds[i].fd/2].fd[N] != -1 &&
!fds[pollfds[i].fd/2].readable[N])
+if (fds[pollfds[i].fd/2].fd[N] != -1 &&
!fds[pollfds[i].fd/2].readable[N] && !fds[pollfds[i].fd/2].shutdown[N])
{
pollfds[i].revents |= POLLOUT;
retval = true;
@@ -231,22 +240,6 @@ int fakeSocketPoll(struct pollfd *pollfds, int nfds, int
timeout)
std::vector& fds = getFds();
std::unique_lock fdsLock(fdsMutex);
-for (int i = 0; i < nfds; i++)
-{
-if (pollfds[i].fd < 0 || pollfds[i].fd/2 >= fds.size())
-{
-pollfds[i].revents = POLLNVAL;
-}
-else
-{
-const int K = ((pollfds[i].fd)&1);
-if (fds[pollfds[i].fd/2].fd[K] == -1)
-pollfds[i].revents = POLLNVAL;
-else
-pollfds[i].revents = 0;
-}
-}
-
std::unique_lock cvLock(cvMutex);
fdsLock.unlock();
@@ -502,6 +495,13 @@ ssize_t fakeSocketRead(int fd, void *buf, size_t nbytes)
return -1;
}
+if (pair.shutdown[K])
+{
+loggingBuffer << "FakeSocket EBADF: Read from fd " << fd << " (shut
down), " << nbytes << (nbytes == 1 ? " byte" : " bytes") << flush();
+errno = EBADF;
+return -1;
+}
+
if (!pair.readable[K])
{
loggingBuffer << "FakeSocket EAGAIN: Read from fd " << fd << ", " <<
nbytes << (nbytes == 1 ? " byte" : " bytes") << flush();
@@ -520,8 +520,8 @@ ssize_t fakeSocketRead(int fd, void *buf, size_t nbytes)
memmove(buf, pair.buffer[K].data(), result);
pair.buffer[K].resize(0);
-// If peer is c
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/qa sc/source
sc/qa/unit/data/xlsx/tdf41425.xlsx|binary
sc/qa/unit/subsequent_export-test.cxx | 16
sc/source/filter/excel/xetable.cxx|3 +++
3 files changed, 19 insertions(+)
New commits:
commit 772c80f7581eb6902c972ce87028a5f5e7f8c4f9
Author: László Németh
AuthorDate: Fri Aug 3 16:11:16 2018 +0200
Commit: Andras Timar
CommitDate: Mon Sep 17 16:35:47 2018 +0200
tdf#41425 XLS/XLSX export: workaround for style and validation loss
of cells of blank rows.
This workaround is probably a fix for problems of most users, but for
a full solution it needs to extend the workaround for all rows with not
default settings, also avoiding of the possible performance problems.
Note: the number 1000 of the extra rows came from a similar workaround used
in
XLSX export of Google Spreadsheets, but instead of listing extra empty 1000
rows in OOXML, this fix writes only the cells with not default settings from
the extra 1000 blank rows.
Reviewed-on: https://gerrit.libreoffice.org/58575
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 99b9ea63bfc9a5fe63a0cd7b30b66ce2c1bde08e)
Reviewed-on: https://gerrit.libreoffice.org/58812
Reviewed-by: Christian Lohmaier
(cherry picked from commit d7cbaac61b8f3575184c675a760907c3b4bb225e)
Change-Id: Icac9441b7eb1520dcd20fc04337e070d070591c7
diff --git a/sc/qa/unit/data/xlsx/tdf41425.xlsx
b/sc/qa/unit/data/xlsx/tdf41425.xlsx
new file mode 100644
index ..f7d3ec9ed6ec
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf41425.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index a071b12b7493..4e50010fb8b9 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -209,6 +209,8 @@ public:
void testHyperlinkTargetFrameODS();
void testOpenDocumentAsReadOnly();
void testTdf118990();
+void testKeepSettingsOfBlankRows();
+
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -318,6 +320,7 @@ public:
CPPUNIT_TEST(testHyperlinkTargetFrameODS);
CPPUNIT_TEST(testOpenDocumentAsReadOnly);
CPPUNIT_TEST(testTdf118990);
+CPPUNIT_TEST(testKeepSettingsOfBlankRows);
CPPUNIT_TEST_SUITE_END();
@@ -4086,6 +4089,19 @@ void ScExportTest::testTdf118990()
xDocSh->DoClose();
}
+void ScExportTest::testKeepSettingsOfBlankRows()
+{
+ScDocShellRef xDocSh = loadDoc("tdf41425.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+std::shared_ptr pXPathFile =
ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX);
+xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pSheet);
+
+// saved blank row with not default setting in A2
+assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row", 2);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 75980091a640..1fc75abd4380 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2456,6 +2456,9 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot
) :
if(nLastUsedScCol > nMaxScCol)
nLastUsedScCol = nMaxScCol;
+// check extra blank rows to avoid of losing their not default settings
(workaround for tdf#41425)
+nLastUsedScRow += 1000;
+
if(nLastUsedScRow > nMaxScRow)
nLastUsedScRow = nMaxScRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Unit.cpp
common/Unit.cpp |1 - 1 file changed, 1 deletion(-) New commits: commit 64c9115a7535ce63d1c9d164d2306fc99dac6e9a Author: Tor Lillqvist AuthorDate: Mon Sep 17 18:05:43 2018 +0300 Commit: Tor Lillqvist CommitDate: Mon Sep 17 18:05:43 2018 +0300 Remove stray #include Change-Id: I1838ae1c40a6ddc8357963c32f5ccf2040e7da10 diff --git a/common/Unit.cpp b/common/Unit.cpp index ac969953c..6391a5d9d 100644 --- a/common/Unit.cpp +++ b/common/Unit.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx svx/source
cui/source/dialogs/srchxtra.cxx | 35 +---
cui/source/factory/dlgfact.cxx|6
cui/source/factory/dlgfact.hxx|3
cui/source/inc/srchxtra.hxx | 11 -
cui/uiconfig/ui/searchformatdialog.ui | 246 --
include/svx/svxdlg.hxx|3
svx/source/dialog/srchdlg.cxx |2
7 files changed, 254 insertions(+), 52 deletions(-)
New commits:
commit c090d2fc981d237a5591a51a94674a35835b706d
Author: Caolán McNamara
AuthorDate: Mon Sep 17 12:30:14 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 18:14:58 2018 +0200
weld SvxSearchFormatDialog
Change-Id: Iefe6c616dc5f6bd525ed9708785846626f43c9b6
Reviewed-on: https://gerrit.libreoffice.org/60579
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index edfb1d0df063..4efffd9aecea 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -33,22 +33,18 @@
#include
#include
-SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const
SfxItemSet& rSet)
-: SfxTabDialog(pParent, "SearchFormatDialog",
"cui/ui/searchformatdialog.ui", &rSet)
-, m_nNamePageId(0)
-, m_nParaStdPageId(0)
-, m_nParaAlignPageId(0)
-, m_nBackPageId(0)
+SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const
SfxItemSet& rSet)
+: SfxTabDialogController(pParent, "cui/ui/searchformatdialog.ui",
"SearchFormatDialog", &rSet)
{
-m_nNamePageId = AddTabPage("font", SvxCharNamePage::Create, nullptr);
+AddTabPage("font", SvxCharNamePage::Create, nullptr);
AddTabPage("fonteffects", SvxCharEffectsPage::Create, nullptr);
AddTabPage("position", SvxCharPositionPage::Create, nullptr);
AddTabPage("asianlayout", SvxCharTwoLinesPage::Create, nullptr);
-m_nParaStdPageId = AddTabPage("labelTP_PARA_STD",
SvxStdParagraphTabPage::Create, nullptr);
-m_nParaAlignPageId = AddTabPage("labelTP_PARA_ALIGN",
SvxParaAlignTabPage::Create, nullptr);
+AddTabPage("labelTP_PARA_STD", SvxStdParagraphTabPage::Create, nullptr);
+AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr);
AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr);
AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr );
-m_nBackPageId = AddTabPage("background", SvxBackgroundTabPage::Create,
nullptr);
+AddTabPage("background", SvxBackgroundTabPage::Create, nullptr);
// remove asian tabpages if necessary
SvtCJKOptions aCJKOptions;
@@ -60,18 +56,11 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window*
pParent, const SfxItem
SvxSearchFormatDialog::~SvxSearchFormatDialog()
{
-disposeOnce();
-}
-
-void SvxSearchFormatDialog::dispose()
-{
-m_pFontList.reset();
-SfxTabDialog::dispose();
}
-void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
+void SvxSearchFormatDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
{
-if (nId == m_nNamePageId)
+if (rId == "font")
{
const FontList* pApm_pFontList = nullptr;
SfxObjectShell* pSh = SfxObjectShell::Current();
@@ -89,7 +78,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId,
SfxTabPage& rPage )
if ( !pList )
{
if ( !m_pFontList )
-m_pFontList.reset( new FontList( this ) );
+m_pFontList.reset(new
FontList(Application::GetDefaultDevice()));
pList = m_pFontList.get();
}
@@ -98,15 +87,15 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId,
SfxTabPage& rPage )
SetFontList( SvxFontListItem( pList, SID_ATTR_CHAR_FONTLIST )
);
static_cast(rPage).EnableSearchMode();
}
-else if (nId == m_nParaStdPageId)
+else if (rId == "labelTP_PARA_STD")
{
static_cast(rPage).EnableAutoFirstLine();
}
-else if (nId == m_nParaAlignPageId)
+else if (rId == "labelTP_PARA_ALIGN")
{
static_cast(rPage).EnableJustifyExt();
}
-else if (nId == m_nBackPageId)
+else if (rId == "background")
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put(SfxUInt32Item(SID_FLAG_TYPE,static_cast(SvxBackgroundTabFlags::SHOW_HIGHLIGHTING)));
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e7c622ad507c..e2c8a6fda1c8 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1143,11 +1143,11 @@ VclPtr
AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window*
return VclPtr::Create( pDlg );
}
-VclPtr
AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent,
+VclPtr
AbstractDialogFactory_Impl::CreateTabItemDialog(weld::Window* pParent,
const SfxItemSet& rSet)
{
-VclPtrInstance pDlg(pParent, rSet);
-return VclPtr::Create(pDl
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig include/vcl sd/inc sd/qa sd/source sd/uiconfig solenv/sanitizers
cui/source/inc/backgrnd.hxx| 84 +++--
cui/source/tabpages/backgrnd.cxx | 484 +++--
cui/uiconfig/ui/backgroundpage.ui | 138 ++---
include/vcl/customweld.hxx |1
sd/inc/sdabstdlg.hxx |2
sd/qa/unit/dialogs-test.cxx| 18 -
sd/source/ui/dlg/dlgchar.cxx | 29 -
sd/source/ui/dlg/sddlgfact.cxx |4
sd/source/ui/dlg/sddlgfact.hxx |2
sd/source/ui/func/fuchar.cxx |2
sd/source/ui/inc/dlg_char.hxx | 12
sd/uiconfig/sdraw/ui/drawchardialog.ui | 128 +++-
solenv/sanitizers/ui/cui.suppr |1
13 files changed, 505 insertions(+), 400 deletions(-)
New commits:
commit 88582ebee383c63c3fba588924f36ff7655af9c1
Author: Caolán McNamara
AuthorDate: Mon Sep 17 11:45:19 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 18:12:14 2018 +0200
weld SdCharDlg
Change-Id: If0c072c0a0a1548034dca37258f72294536ec566
Reviewed-on: https://gerrit.libreoffice.org/60578
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index f9c364c3a428..e8b1ed936ce1 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -170,7 +170,7 @@ public:
virtual VclPtr CreateBreakDlg(weld::Window*
pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong
nSumActionCount, sal_uLong nObjCount ) = 0;
virtual VclPtrCreateCopyDlg(vcl::Window*
pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
virtual VclPtr
CreateSdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
-virtual VclPtr
CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell) = 0;
+virtual VclPtr
CreateSdTabCharDialog(weld::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell) = 0;
virtual VclPtr
CreateSdTabPageDialog(weld::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell, bool bAreaPage) = 0;
virtual VclPtr
CreateSdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField,
const SfxItemSet& rSet) = 0;
virtual VclPtr
CreateSdSnapLineDlg(weld::Window* pParent, const SfxItemSet& rInAttrs,
::sd::View* pView) = 0;
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 1fe44cc04243..0988949f415d 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -305,10 +305,8 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
SdDrawDocument* pDrawDoc = getSdXImpressDocument()->GetDoc();
CPPUNIT_ASSERT(pDrawDoc);
-auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdCustomShowDlg(
-parent == nullptr ? nullptr : parent->GetFrameWeld(),
-*pDrawDoc);
+getViewShell()->GetFrameWeld(), *pDrawDoc);
break;
}
case 4:
@@ -317,7 +315,7 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
// needs an SfxItemSet, use an empty constructed one
// needs a 'SfxObjectShell* pDocShell', crashes without
pRetval = getSdAbstractDialogFactory()->CreateSdTabCharDialog(
-getViewShell()->GetActiveWindow(),
+getViewShell()->GetFrameWeld(),
&getEmptySfxItemSet(),
getDocShell());
break;
@@ -327,9 +325,8 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
// CreateSdTabPageDialog(const SfxItemSet* pAttr, SfxObjectShell*
pDocShell, bool bAreaPage = true) override;
// needs a special SfxItemSet with merged content from page and
other stuff, crashes without that (2nd page)
// needs a 'SfxObjectShell* pDocShell', crashes without. Also
sufficient: FillStyleItemSet with XFILL_NONE set
-auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdTabPageDialog(
-parent == nullptr ? nullptr : parent->GetFrameWeld(),
+getViewShell()->GetFrameWeld(),
&getEmptyFillStyleSfxItemSet(),
getDocShell(),
true);
@@ -338,9 +335,8 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
case 6:
{
// CreateSdModifyFieldDlg(weld::Window* pWindow, const
SvxFieldData* pInField, const SfxItemSet& rSet) override;
-auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdModifyFieldDlg(
-parent == nullptr ? nullptr : parent->GetFrameWeld(),
+getViewShell()->GetFrameWeld(),
nullptr,
getEmptySfxItemSet());
b
Weekly QA Report (W37-2018)
Hello, What have happened in QA in the last 7 days? * 141 bugs have been reported by 100 people. + Link: http://tinyurl.com/y7u8uc7d * Top 15 reporters: + Xisco Faulí (7) + Telesto (7) + Michael Weghorn (5) + Samuel Thibault (4) + Albert Acer (4) + Patrick Jaap (3) + Aron Budea (3) + J22Gim (3) + Tomasz Palutkiewicz (2) + Buovjaga (2) + Heiko Tietze (2) + Andy (2) + Regina Henschel (2) + pieter kristensen (2) + Ofir (2) * 56 bugs reported haven't been triaged yet. + Link: http://tinyurl.com/y7pwesfz * Total number of unconfirmed bugs: 498 * 1098 comments have been written by 167 people. * 50 new people have signed up to Bugzilla. == STATUSES CHANGED == * 1 bug has been changed from 'ASSIGNED' to 'NEW'. + Link: http://tinyurl.com/y74p9fnw + Done by: Xisco Faulí (1) * 20 bugs have been changed from 'ASSIGNED' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y8m4enjh + Done by: László Németh (3), Justin L (3), balazs.varga991 (3) Adolfo Jayme (2), Xisco Faulí (1), Miklos Vajna (1) Paul Trojahn (1), Mike Kaganski (1), Juergen Funk (CIB) (1) * 7 bugs have been changed from 'NEEDINFO' to 'NEW'. + Link: http://tinyurl.com/y8f933cp + Done by: Xisco Faulí (5), Mike Kaganski (1), Timur (1) * 1 bug has been changed from 'NEEDINFO' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/y7o8sf5k + Done by: Xisco Faulí (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/yaepyzcr + Done by: gorelov.rs (1), dmhymers (1) * 2 bugs have been changed from 'NEEDINFO' to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/y88obkoc + Done by: Heiko Tietze (2) * 1 bug has been changed from 'NEEDINFO' to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/ycpugmv3 + Done by: Xisco Faulí (1) * 3 bugs have been changed from 'NEEDINFO' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/yau6b639 + Done by: Xisco Faulí (2), Thomas Lendo (1) * 6 bugs have been changed from 'NEEDINFO' to 'UNCONFIRMED'. + Link: http://tinyurl.com/ybeb773m + Done by: Xisco Faulí (2), Wilfried Koch (1), tim (1), Mark Mclean (1) * 12 bugs have been changed from 'NEW' to 'ASSIGNED'. + Link: http://tinyurl.com/y8qohbto + Done by: Xisco Faulí (3), László Németh (2), Miklos Vajna (1) Julien Nabet (1), Samuel Mehrbrodt (CIB) (1) balazs.varga991 (1), Armin Le Grand (CIB) (1) * 2 bugs have been changed from 'NEW' to 'NEEDINFO'. + Link: http://tinyurl.com/y94yypnc + Done by: m.a.riosv (1), Cor Nouws (1) * 11 bugs have been changed from 'NEW' to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/y9atdcu4 + Done by: Xisco Faulí (5), Telesto (2), Kovács Viktor (1) Cor Nouws (1), Katarina Behrens (CIB) (1) * 17 bugs have been changed from 'NEW' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/ydxl5x9r + Done by: Noel Grandin (4), Xisco Faulí (2) V Stuart Foote (1), Buovjaga (1), László Németh (1) Maxim Monastirsky (1), Michael Weghorn (1), Justin L (1) Cor Nouws (1) * 1 bug has been changed from 'NEW' to 'RESOLVED INVALID'. + Link: http://tinyurl.com/y8vt9zqz + Done by: Cor Nouws (1) * 2 bugs have been changed from 'NEW' to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/yd5bpc45 + Done by: m.a.riosv (1), Lionel Elie Mamane (1) * 1 bug has been changed from 'NEW' to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/y8xyefzv + Done by: Buovjaga (1) * 4 bugs have been changed from 'NEW' to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/y7ljel6j + Done by: Heiko Tietze (1), Thomas Lendo (1), raal (1) * 8 bugs have been changed from 'NEW' to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/ycqblzxj + Done by: Heiko Tietze (2), kompilainenn (2), V Stuart Foote (1) Luke (1), Howard Rudd (1) * 4 bugs have been changed from 'NEW' to 'UNCONFIRMED'. + Link: http://tinyurl.com/yadfkx5c + Done by: Xisco Faulí (1), Thomas Lendo (1), MM (1), Drew Jensen (1) * 1 bug has been changed from 'REOPENED' to 'NEEDINFO'. + Link: http://tinyurl.com/ya95r62g + Done by: Xisco Faulí (1) * 2 bugs have been changed from 'REOPENED' to 'NEW'. + Link: http://tinyurl.com/ybaftzea + Done by: Xisco Faulí (1), Michael Weghorn (1) * 1 bug has been changed from 'REOPENED' to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y8ax
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 72 commits - sw/inc sw/qa sw/source
Rebased ref, commits from common ancestor:
commit 7b92f8f3feed52a57ecf92392a3e1bccf66e0cf2
Author: Michael Stahl
AuthorDate: Mon Sep 17 12:01:46 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Sep 17 17:03:23 2018 +0200
sw_redlinehide_2: replace SW_REDLINEHIDE with ExperimentalMode config
So we can get more testing & many bug reports.
Change-Id: I34fe456a58670baecf4fdf1a87da77aceab43891
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 08a086621031..cc4fe8616983 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -854,7 +855,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
m_aOption.IsFormatsOnly() ||
// sw_redlinehide: disable layout cache for now
- (getenv("SW_REDLINEHIDE") &&
!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+ (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
+!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
{
try
{
@@ -902,7 +904,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
// tdf#83260 ensure that the first call of CompressRedlines after loading
// the document is a no-op by calling it now
rDoc.getIDocumentRedlineAccess().CompressRedlines();
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{ // can't set it on the layout or view shell because it doesn't exist
yet
rDoc.GetDocumentRedlineManager().SetHideRedlines(!(nRedlineFlags &
RedlineFlags::ShowDelete));
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 26a16a31ce29..87ecd70566fb 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -26,6 +26,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -184,7 +186,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference <
task::XStatusIndicator >& xS
const OUString sShowChanges("ShowChanges");
RedlineFlags nRedlineFlags =
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags();
bool isShowChanges;
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{ // TODO: ideally this would be stored per-view...
isShowChanges =
!m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->IsHideRedlines();
}
@@ -414,7 +416,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference <
task::XStatusIndicator >& xS
nRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags();
nRedlineFlags &= ~RedlineFlags::ShowMask;
nRedlineFlags |= RedlineFlags::ShowInsert;
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
nRedlineFlags |= RedlineFlags::ShowDelete;
}
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 06e3e8cc6bf0..e4b377fbaacb 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -637,7 +638,9 @@ void SwView::Execute(SfxRequest &rReq)
if( static_cast(pItem)->GetValue() )
nMode |= RedlineFlags::ShowDelete;
-if (getenv("SW_REDLINEHIDE")) // TODO...
+uno::Reference const xContext(
+comphelper::getProcessComponentContext());
+if
(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
m_pWrtShell->GetLayout()->SetHideRedlines(
!static_cast(pItem)->GetValue());
diff --git a/sw/source/uibase/uiview/viewstat.cxx
b/sw/source/uibase/uiview/viewstat.cxx
index 437fb12b11f0..49020bde88e1 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -281,7 +282,9 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case FN_REDLINE_SHOW:
{
-if (getenv("SW_REDLINEHIDE")) // TODO...
+uno::Reference const xContext(
+comphelper::getProcessComponentContext());
+if
(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
rSet.Put(SfxBoolItem(nWhich,
!m_pWrtShell->GetLayout()->IsHideRedlines()));
}
commit b030bba8376f6998fe7f69e168c09821bf704980
Author: Michael Stahl
AuthorDate: Mon Sep 17 11:26:01 2018 +0200
Commit: Michael Stahl
CommitDate: M
[Libreoffice-commits] core.git: sc/IwyuFilter_sc.yaml sc/source
sc/IwyuFilter_sc.yaml|6 ++ sc/source/filter/excel/excdoc.cxx|4 sc/source/filter/excel/excel.cxx |1 + sc/source/filter/excel/excimp8.cxx |1 + sc/source/filter/excel/excrecds.cxx |2 ++ sc/source/filter/excel/expop2.cxx|1 + sc/source/filter/excel/read.cxx |2 ++ sc/source/filter/excel/xechart.cxx |1 + sc/source/filter/excel/xecontent.cxx |3 +++ sc/source/filter/excel/xeescher.cxx |5 + sc/source/filter/excel/xeformula.cxx |3 +++ sc/source/filter/excel/xehelper.cxx |1 + sc/source/filter/excel/xelink.cxx|4 sc/source/filter/excel/xename.cxx|5 + sc/source/filter/excel/xepage.cxx|2 ++ sc/source/filter/excel/xepivot.cxx |3 +++ sc/source/filter/excel/xerecord.cxx |2 ++ sc/source/filter/excel/xeroot.cxx|3 +++ sc/source/filter/excel/xestream.cxx |2 ++ sc/source/filter/excel/xestring.cxx |1 + sc/source/filter/excel/xestyle.cxx |1 + sc/source/filter/excel/xetable.cxx |4 sc/source/filter/excel/xeview.cxx|3 +++ sc/source/filter/excel/xichart.cxx |1 + sc/source/filter/excel/xicontent.cxx |1 + sc/source/filter/excel/xiescher.cxx |1 + sc/source/filter/excel/xihelper.cxx |1 + sc/source/filter/excel/xilink.cxx|1 + sc/source/filter/excel/xiname.cxx|1 + sc/source/filter/excel/xipivot.cxx |2 ++ sc/source/filter/excel/xistream.cxx |2 ++ sc/source/filter/excel/xistring.cxx |1 + sc/source/filter/excel/xistyle.cxx |5 + sc/source/filter/excel/xlchart.cxx |1 + sc/source/filter/excel/xlpage.cxx|1 + sc/source/filter/excel/xlpivot.cxx |5 + sc/source/filter/excel/xlroot.cxx|2 ++ sc/source/filter/excel/xlstyle.cxx |2 ++ sc/source/filter/inc/XclExpChangeTrack.hxx |7 +++ sc/source/filter/inc/XclImpChangeTrack.hxx |4 +--- sc/source/filter/inc/excform.hxx |1 + sc/source/filter/inc/imp_op.hxx |3 +++ sc/source/filter/inc/xcl97esc.hxx|8 ++-- sc/source/filter/inc/xcl97rec.hxx|5 +++-- sc/source/filter/inc/xecontent.hxx |6 +- sc/source/filter/inc/xedbdata.hxx|1 - sc/source/filter/inc/xeescher.hxx|4 +++- sc/source/filter/inc/xeextlst.hxx|1 - sc/source/filter/inc/xeformula.hxx |2 ++ sc/source/filter/inc/xehelper.hxx|5 ++--- sc/source/filter/inc/xelink.hxx |9 - sc/source/filter/inc/xename.hxx |1 - sc/source/filter/inc/xepivot.hxx |4 sc/source/filter/inc/xepivotxml.hxx |1 - sc/source/filter/inc/xerecord.hxx|1 + sc/source/filter/inc/xeroot.hxx |4 ++-- sc/source/filter/inc/xestream.hxx| 14 -- sc/source/filter/inc/xestyle.hxx |4 sc/source/filter/inc/xetable.hxx |8 +++- sc/source/filter/inc/xichart.hxx |4 sc/source/filter/inc/xicontent.hxx |7 +++ sc/source/filter/inc/xiescher.hxx|7 --- sc/source/filter/inc/xihelper.hxx|3 +-- sc/source/filter/inc/xilink.hxx |1 + sc/source/filter/inc/xiname.hxx |2 -- sc/source/filter/inc/xistring.hxx|1 + sc/source/filter/inc/xistyle.hxx |5 +++-- sc/source/filter/inc/xlchart.hxx |2 -- sc/source/filter/inc/xlescher.hxx|3 --- sc/source/filter/inc/xlpage.hxx |2 +- sc/source/filter/inc/xlpivot.hxx |7 --- sc/source/filter/inc/xlroot.hxx | 12 sc/source/filter/inc/xlstream.hxx|1 - sc/source/filter/inc/xlstring.hxx|2 +- sc/source/filter/inc/xlstyle.hxx |3 +-- sc/source/filter/inc/xltools.hxx |2 +- sc/source/filter/inc/xltracer.hxx|4 ++-- sc/source/filter/inc/xlview.hxx |1 - sc/source/filter/oox/excelfilter.cxx |1 + sc/source/filter/xcl97/XclExpChangeTrack.cxx |3 +++ sc/source/filter/xcl97/xcl97esc.cxx |1 + sc/source/filter/xcl97/xcl97rec.cxx |2 ++ 82 files changed, 152 insertions(+), 104 deletions(-) New commits: commit b943b9b974ac8c093677b4f625e93c6e64e4ceb4 Author: Gabor Kelemen AuthorDate: Sat Sep 15 10:37:35 2018 +0200 Commit: Miklos Vajna CommitDate: Mon Sep 17 16:43:45 2018 +0200 tdf#42949 Fix IWYU warnings in sc/source/filter/inc/[x
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 748 commits - accessibility/source animations/source avmedia/Module_avmedia.mk avmedia/source basctl/source basegfx/Library_base
Rebased ref, commits from common ancestor:
commit 78a998e7ba8c464440aa28abf6d9954a7abca7f1
Author: Michael Stahl
AuthorDate: Mon Sep 17 12:01:46 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Sep 17 15:56:45 2018 +0200
sw_redlinehide_2: replace SW_REDLINEHIDE with ExperimentalMode config
So we can get more testing & many bug reports.
Change-Id: I34fe456a58670baecf4fdf1a87da77aceab43891
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 08a086621031..cc4fe8616983 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -854,7 +855,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
m_aOption.IsFormatsOnly() ||
// sw_redlinehide: disable layout cache for now
- (getenv("SW_REDLINEHIDE") &&
!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+ (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
+!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
{
try
{
@@ -902,7 +904,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
// tdf#83260 ensure that the first call of CompressRedlines after loading
// the document is a no-op by calling it now
rDoc.getIDocumentRedlineAccess().CompressRedlines();
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{ // can't set it on the layout or view shell because it doesn't exist
yet
rDoc.GetDocumentRedlineManager().SetHideRedlines(!(nRedlineFlags &
RedlineFlags::ShowDelete));
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 26a16a31ce29..87ecd70566fb 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -26,6 +26,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -184,7 +186,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference <
task::XStatusIndicator >& xS
const OUString sShowChanges("ShowChanges");
RedlineFlags nRedlineFlags =
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags();
bool isShowChanges;
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{ // TODO: ideally this would be stored per-view...
isShowChanges =
!m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->IsHideRedlines();
}
@@ -414,7 +416,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference <
task::XStatusIndicator >& xS
nRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags();
nRedlineFlags &= ~RedlineFlags::ShowMask;
nRedlineFlags |= RedlineFlags::ShowInsert;
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
nRedlineFlags |= RedlineFlags::ShowDelete;
}
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 06e3e8cc6bf0..e4b377fbaacb 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -637,7 +638,9 @@ void SwView::Execute(SfxRequest &rReq)
if( static_cast(pItem)->GetValue() )
nMode |= RedlineFlags::ShowDelete;
-if (getenv("SW_REDLINEHIDE")) // TODO...
+uno::Reference const xContext(
+comphelper::getProcessComponentContext());
+if
(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
m_pWrtShell->GetLayout()->SetHideRedlines(
!static_cast(pItem)->GetValue());
diff --git a/sw/source/uibase/uiview/viewstat.cxx
b/sw/source/uibase/uiview/viewstat.cxx
index 437fb12b11f0..49020bde88e1 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -281,7 +282,9 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case FN_REDLINE_SHOW:
{
-if (getenv("SW_REDLINEHIDE")) // TODO...
+uno::Reference const xContext(
+comphelper::getProcessComponentContext());
+if
(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
rSet.Put(SfxBoolItem(nWhich,
!m_pWrtShell->GetLayout()->IsHideRedlines()));
}
commit 0fd3c901843ad1d035af6fb60a5da4c956dd28e8
Author: Michael Stahl
AuthorDate: Mon Sep 17 11:26:01 2018 +0200
Commit: Michael Stahl
CommitDate: M
[Libreoffice-commits] core.git: sd/inc sd/qa sd/source sd/uiconfig
sd/inc/sdabstdlg.hxx |2
sd/qa/unit/dialogs-test.cxx|3
sd/source/ui/dlg/dlgpage.cxx | 29 -
sd/source/ui/dlg/sddlgfact.cxx | 40
sd/source/ui/dlg/sddlgfact.hxx | 22 ++
sd/source/ui/func/fupage.cxx |2
sd/source/ui/inc/dlgpage.hxx |9 --
sd/uiconfig/sdraw/ui/drawpagedialog.ui | 104 -
8 files changed, 169 insertions(+), 42 deletions(-)
New commits:
commit a7e9db8338e93921ede5892545ce18655d08aad5
Author: Caolán McNamara
AuthorDate: Sun Sep 16 14:24:12 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 16:06:08 2018 +0200
weld SdPageDlg
Change-Id: Id9c78651d3eb315bf2e982eef48ef24071bfc79b
Reviewed-on: https://gerrit.libreoffice.org/60550
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 332312ae77ba..f9c364c3a428 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -171,7 +171,7 @@ public:
virtual VclPtrCreateCopyDlg(vcl::Window*
pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView ) = 0;
virtual VclPtr
CreateSdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc) = 0;
virtual VclPtr
CreateSdTabCharDialog(vcl::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell) = 0;
-virtual VclPtr
CreateSdTabPageDialog(vcl::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell, bool bAreaPage) = 0;
+virtual VclPtr
CreateSdTabPageDialog(weld::Window* pWindow, const SfxItemSet* pAttr,
SfxObjectShell* pDocShell, bool bAreaPage) = 0;
virtual VclPtr
CreateSdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pInField,
const SfxItemSet& rSet) = 0;
virtual VclPtr
CreateSdSnapLineDlg(weld::Window* pParent, const SfxItemSet& rInAttrs,
::sd::View* pView) = 0;
virtual VclPtr
CreateSdInsertLayerDlg(weld::Window* pParent, const SfxItemSet& rInAttrs, bool
bDeletable, const OUString& rStr) = 0;
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index dd9a6d989bec..1fe44cc04243 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -327,8 +327,9 @@ VclPtr
SdDialogsTest::createDialogByID(sal_uInt32 nID)
// CreateSdTabPageDialog(const SfxItemSet* pAttr, SfxObjectShell*
pDocShell, bool bAreaPage = true) override;
// needs a special SfxItemSet with merged content from page and
other stuff, crashes without that (2nd page)
// needs a 'SfxObjectShell* pDocShell', crashes without. Also
sufficient: FillStyleItemSet with XFILL_NONE set
+auto const parent = getViewShell()->GetActiveWindow();
pRetval = getSdAbstractDialogFactory()->CreateSdTabPageDialog(
-getViewShell()->GetActiveWindow(),
+parent == nullptr ? nullptr : parent->GetFrameWeld(),
&getEmptyFillStyleSfxItemSet(),
getDocShell(),
true);
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 75933ae73271..97e03977ef1a 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -33,12 +33,9 @@
/**
* Constructor of tab dialog: appends pages to the dialog
*/
-SdPageDlg::SdPageDlg( SfxObjectShell const * pDocSh, vcl::Window* pParent,
const SfxItemSet* pAttr, bool bAreaPage ) :
-SfxTabDialog ( pParent
- ,"DrawPageDialog"
- ,"modules/sdraw/ui/drawpagedialog.ui"
- , pAttr ),
-mpDocShell ( pDocSh )
+SdPageDlg::SdPageDlg(SfxObjectShell const * pDocSh, weld::Window* pParent,
const SfxItemSet* pAttr, bool bAreaPage)
+: SfxTabDialogController(pParent, "modules/sdraw/ui/drawpagedialog.ui",
"DrawPageDialog", pAttr)
+, mpDocShell(pDocSh)
{
SvxColorListItem const * pColorListItem = mpDocShell->GetItem(
SID_COLOR_TABLE );
SvxGradientListItem const * pGradientListItem = mpDocShell->GetItem(
SID_GRADIENT_LIST );
@@ -54,28 +51,28 @@ SdPageDlg::SdPageDlg( SfxObjectShell const * pDocSh,
vcl::Window* pParent, const
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-mnPage = AddTabPage( "RID_SVXPAGE_PAGE", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_PAGE ), nullptr );
-mnArea = AddTabPage( "RID_SVXPAGE_AREA", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_AREA ), nullptr );
-mnTransparence = AddTabPage( "RID_SVXPAGE_TRANSPARENCE",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), nullptr );
+AddTabPage("RID_SVXPAGE_PAGE",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PAGE), nullptr);
+AddTabPage("RID_SVXPAGE_AREA",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_AREA), nullptr);
+AddTabPage("RID_SVXPAGE_TRANSPARENCE",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TRANSPARENCE), nullptr);
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 95401c5b3eef03497af6a85afc6e907c659ef6f7
Author: Caolán McNamara
AuthorDate: Mon Sep 17 11:34:34 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 16:05:01 2018 +0200
tweak combobox vs comboboxtext
Change-Id: I3e183d2cc0b0372b961b295801887bc4aadeb3b3
Reviewed-on: https://gerrit.libreoffice.org/60574
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 93f23b2b0e8e..28492d27d0dc 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4673,7 +4673,8 @@ public:
, m_nChangedSignalId(g_signal_connect(m_pComboBox, "changed",
G_CALLBACK(signalChanged), this))
, m_nPopupShownSignalId(g_signal_connect(m_pComboBox,
"notify::popup-shown", G_CALLBACK(signalPopupShown), this))
{
-if (!has_entry())
+GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox));
+if (!g_list_length(cells))
{
//Always use the same text column renderer layout
GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new();
@@ -4685,7 +4686,6 @@ public:
{
// this bit isn't great, I really want to be able to ellipse the
text in the comboboxtext itself and let
// the popup menu render them in full, in the interim allow the
text to wrap in both cases
-GList* cells =
gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox));
GtkCellRenderer* cell = static_cast(cells->data);
g_object_set(G_OBJECT(cell), "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
nullptr);
if (g_list_length(cells) == 2)
@@ -4695,8 +4695,8 @@ public:
//column will be after it, but we want it before
gtk_cell_layout_reorder(GTK_CELL_LAYOUT(m_pComboBox), cell, 1);
}
-g_list_free(cells);
}
+g_list_free(cells);
if (GtkEntry* pEntry = get_entry())
{
___
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' - sfx2/source
sfx2/source/doc/docfile.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit f06aea9b31707ec49355e41b0e682d4a15431e44
Author: Miklos Vajna
AuthorDate: Mon Sep 10 21:01:07 2018 +0200
Commit: Caolán McNamara
CommitDate: Mon Sep 17 15:58:31 2018 +0200
tdf#119316 sfx2 store: no move on macOS
osl::FileStatus::getAttributes() and osl::File::setAttributes() doesn't
preserve all the necessary file properties (at least "Hide extension" is not
handled), so always copy on macOS instead.
(cherry picked from commit 7823684cb6fbe752dc64300799c5d102f61e0b70)
Change-Id: I529467cc3d432d04e593f936c13ed4656a18150c
Reviewed-on: https://gerrit.libreoffice.org/60307
Tested-by: Jenkins
Tested-by: Xisco Faulí
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index e6a858ae6bf8..a852a01e644e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -199,10 +199,17 @@ sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
return nRet;
}
-/// Determines if rURL is a non-linked (symlink or hardlink) file:// URL.
-bool IsNotLinkedFile(const OUString& rURL)
+/// Determines if rURL is safe to move or not.
+bool IsFileMovable(const OUString& rURL)
{
+#ifdef MACOSX
+(void)rURL;
+// Hide extension macOS-specific file property would be lost.
+return false;
+#else
+
if (!comphelper::isFileUrl(rURL))
+// Not a file:// URL.
return false;
#ifdef UNX
@@ -220,6 +227,7 @@ bool IsNotLinkedFile(const OUString& rURL)
#endif
return true;
+#endif
}
} // anonymous namespace
@@ -1852,7 +1860,7 @@ void SfxMedium::TransactedTransferForFS_Impl( const
INetURLObject& aSource,
OUString aDestMainURL =
aDest.GetMainURL(INetURLObject::DecodeMechanism::NONE);
sal_uInt64 nAttributes =
GetDefaultFileAttributes(aDestMainURL);
-if (IsNotLinkedFile(aDestMainURL) &&
osl::File::move(aSourceMainURL, aDestMainURL) == osl::FileBase::E_None)
+if (IsFileMovable(aDestMainURL) &&
osl::File::move(aSourceMainURL, aDestMainURL) == osl::FileBase::E_None)
{
if (nAttributes)
// Adjust attributes, source might be created with
___
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' - solenv/bin
solenv/bin/modules/installer/windows/file.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4db4befcb7f710cb9ec0dcc9968ee2d0b836a1c2
Author: Mike Kaganski
AuthorDate: Sun Sep 16 12:13:27 2018 +0200
Commit: Caolán McNamara
CommitDate: Mon Sep 17 15:58:11 2018 +0200
tdf#119897: "Version " prefix is optional
Hopefully this fixes the problem, which is being incorrect version written
for the font in MSI (1.0.0.0), and comparing with installed one (1.3), the
font is removed and not reinstalled.
Change-Id: Iee675e2c2b3f29c76e35dcf41bbcce9b6181bf62
Reviewed-on: https://gerrit.libreoffice.org/60548
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 38aae53a1004bb7393c81a98c7b370344613244e)
Reviewed-on: https://gerrit.libreoffice.org/60556
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/solenv/bin/modules/installer/windows/file.pm
b/solenv/bin/modules/installer/windows/file.pm
index 43b2ef3e858f..081edde6db99 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -562,9 +562,9 @@ sub get_fileversion
my $ttfdata = $fnt->{'name'}->read->find_name(5);
$fnt->release;
-if ($ttfdata =~ /Version ([0-9]+(\.[0-9]+)*)/i)
+if ($ttfdata =~ /(Version )?([0-9]+(\.[0-9]+)*)/i)
{
-my ($version, $subversion, $microversion, $vervariant) =
split(/\./,$1);
+my ($version, $subversion, $microversion, $vervariant) =
split(/\./,$2);
$fileversion = int($version) . "." . int($subversion) . "." .
int($microversion) . "." . int($vervariant);
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objserv.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 408ea1f0d449fdcd2ddaa50155c7a1a26a048ca8
Author: Samuel Mehrbrodt
AuthorDate: Mon Sep 17 10:32:59 2018 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Sep 17 15:41:34 2018 +0200
Only check ODF version when signing ODF
This allows signing ooxml when an older default ODF version
has been configured.
Change-Id: I8e44caa2795c1da445895dd68d8cc60370c5747c
Reviewed-on: https://gerrit.libreoffice.org/60560
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 6cfed0679a4a..3874f21cd56b 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1416,15 +1416,7 @@ bool SfxObjectShell::PrepareForSigning(weld::Window*
pDialogParent)
ImplGetSignatureState( true ); // script signature
bool bHasSign = ( pImpl->nScriptingSignatureState !=
SignatureState::NOSIGNATURES || pImpl->nDocumentSignatureState !=
SignatureState::NOSIGNATURES );
-// the target ODF version on saving
-
-// Please fix this comment if you can: Note that the talk about "ODF
version" around here is a
-// bit silly, as there should be nothing ODF-specific in this code, right?
What we mean, I
-// think, is "ODF version iff it is ODF that is the format the document is
being stored as", and
-// otherwise the "ODF version" is ignored. Not sure why such
format-specific things needs to be
-// handled here. Digital signatures then complicate matters further, as
it's only ODF 1.2 and
-// OOXML that have digital signatures.
-
+// the target ODF version on saving (only valid when signing ODF of course)
SvtSaveOptions aSaveOpt;
SvtSaveOptions::ODFDefaultVersion nVersion =
aSaveOpt.GetODFDefaultVersion();
@@ -1432,7 +1424,7 @@ bool SfxObjectShell::PrepareForSigning(weld::Window*
pDialogParent)
OUString
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(GetStorage()));
if ( IsModified() || !GetMedium() || GetMedium()->GetName().isEmpty()
- || (aODFVersion != ODFVER_012_TEXT && !bHasSign) )
+ || (GetMedium()->GetFilter()->IsOwnFormat() && aODFVersion !=
ODFVER_012_TEXT && !bHasSign) )
{
// the document might need saving ( new, modified or in ODF1.1 format
without signature )
___
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/conditional_format/tdf105544.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69b9cf6fe4a10d2820b2203883a583588ec13726
Author: Andrea Gelmini
AuthorDate: Mon Sep 17 11:45:18 2018 +0200
Commit: Julien Nabet
CommitDate: Mon Sep 17 15:38:14 2018 +0200
Fix typo
Change-Id: Id3f164a5b5016fd7f1e33a0cb9e94ee84c1df6e5
Reviewed-on: https://gerrit.libreoffice.org/60566
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/qa/uitest/conditional_format/tdf105544.py
b/sc/qa/uitest/conditional_format/tdf105544.py
index 9b48353fabd3..828807e90f58 100644
--- a/sc/qa/uitest/conditional_format/tdf105544.py
+++ b/sc/qa/uitest/conditional_format/tdf105544.py
@@ -25,7 +25,7 @@ class tdf105544(UITestCase):
xCalcDoc = self.xUITest.getTopFocusWindow()
gridwin = xCalcDoc.getChild("grid_window")
document = self.ui_test.get_component()
-#2. select B3. Format> conditional formating> manage
+#2. select B3. Format> conditional formatting> manage
gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"}))
self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog")
xCondFormatMgr = self.xUITest.getTopFocusWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/items/stylepool.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 88ec498f1d287dced1a9ca095a0776b14a023891
Author: himajin10
AuthorDate: Sun Sep 16 18:54:16 2018 +0900
Commit: Noel Grandin
CommitDate: Mon Sep 17 15:18:33 2018 +0200
adapt to commit 1476d95b6ed3afa35ccc
Change-Id: Ie6582b324d4c7feb8dbc7cac852b2c52358a052a
Reviewed-on: https://gerrit.libreoffice.org/60547
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index cdda2f9de0e3..9ea2b42f9ff0 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -417,7 +417,7 @@ std::shared_ptr StylePoolImpl::insertItemSet(
const SfxItemSet& rSet
#ifdef DEBUG
{
sal_Int32 nCheck = -1;
-IStylePoolIteratorAccess* pIter = createIterator(false,false);
+std::unique_ptr pIter =
createIterator(false,false);
std::shared_ptr pTemp;
do
{
@@ -425,7 +425,6 @@ std::shared_ptr StylePoolImpl::insertItemSet(
const SfxItemSet& rSet
pTemp = pIter->getNext();
} while( pTemp.get() );
DBG_ASSERT( mnCount == nCheck, "Wrong counting");
-delete pIter;
}
#endif
return pCurNode->getItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source cui/source filter/source include/sfx2 include/svtools include/svx include/vcl reportdesign/source sc/source sd/source sfx2/source starmath/inc starmath/so
chart2/source/controller/dialogs/tp_ChartType.cxx |8 - cui/source/customize/cfg.cxx |2 cui/source/dialogs/FontFeaturesDialog.cxx |6 - cui/source/dialogs/cuicharmap.cxx | 10 - cui/source/dialogs/cuigaldlg.cxx |2 cui/source/inc/FontFeaturesDialog.hxx |6 - cui/source/inc/backgrnd.hxx|2 cui/source/inc/cfg.hxx |2 cui/source/inc/chardlg.hxx | 30 ++--- cui/source/inc/cuicharmap.hxx | 10 - cui/source/inc/cuigaldlg.hxx |2 cui/source/inc/cuitabarea.hxx | 28 ++--- cui/source/inc/labdlg.hxx | 10 - cui/source/inc/numpages.hxx| 10 - cui/source/inc/page.hxx| 14 +- cui/source/inc/paragrph.hxx| 22 +-- cui/source/inc/swpossizetabpage.hxx| 22 +-- cui/source/inc/textanim.hxx|4 cui/source/options/optdict.cxx |2 cui/source/tabpages/backgrnd.cxx |2 cui/source/tabpages/chardlg.cxx| 62 +-- cui/source/tabpages/labdlg.cxx | 10 - cui/source/tabpages/numpages.cxx | 10 - cui/source/tabpages/page.cxx | 20 +-- cui/source/tabpages/paragrph.cxx | 24 ++-- cui/source/tabpages/swpossizetabpage.cxx | 24 ++-- cui/source/tabpages/textanim.cxx |4 cui/source/tabpages/tpbitmap.cxx | 10 - cui/source/tabpages/tpcolor.cxx|4 cui/source/tabpages/tpgradnt.cxx |6 - cui/source/tabpages/tphatch.cxx|6 - cui/source/tabpages/tptrans.cxx|6 - filter/source/pdf/impdialog.cxx|6 - filter/source/pdf/impdialog.hxx|6 - filter/source/xsltdialog/xmlfiltertabpagebasic.cxx |2 filter/source/xsltdialog/xmlfiltertabpagebasic.hxx |2 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx |6 - include/sfx2/mgetempl.hxx | 12 +- include/sfx2/newstyle.hxx |2 include/svtools/PlaceEditDialog.hxx|6 - include/svtools/ServerDetailsControls.hxx |2 include/svtools/ctrlbox.hxx| 16 +- include/svtools/inettbc.hxx| 10 - include/svtools/prnsetup.hxx | 12 +- include/svx/SvxNumOptionsTabPageHelper.hxx |2 include/svx/colorwindow.hxx|4 include/svx/compressgraphicdialog.hxx |8 - include/svx/frmdirlbox.hxx |6 - include/svx/galtheme.hxx |2 include/svx/langbox.hxx| 10 - include/svx/pagenumberlistbox.hxx |6 - include/svx/papersizelistbox.hxx |8 - include/svx/txencbox.hxx |6 - include/vcl/weld.hxx | 18 +-- reportdesign/source/ui/dlg/DateTime.cxx|6 - reportdesign/source/ui/inc/DateTime.hxx|4 sc/source/ui/dbgui/dapidata.cxx|8 - sc/source/ui/dbgui/dapitype.cxx|4 sc/source/ui/dbgui/sortkeydlg.cxx |2 sc/source/ui/dbgui/tpsort.cxx | 14 +- sc/source/ui/inc/dapidata.hxx |8 - sc/source/ui/inc/dapitype.hxx |4 sc/source/ui/inc/datastreamdlg.hxx |2 sc/source/ui/inc/linkarea.hxx |2 sc/source/ui/inc/mvtabdlg.hxx |4 sc/source/ui/inc/sortkeydlg.hxx|2 sc/source/ui/inc/tpsort.hxx| 12 +- sc/source/ui/miscdlgs/datastreamdlg.cxx|4 sc/source/ui/miscdlgs/linkarea.cxx |4 sc/source/ui/miscdlgs/mvtabdlg.cxx |4 sc/source/ui/optdlg/calcoptionsdlg.cxx |8 - sc/source/ui/optdlg/calcoptionsdlg.hxx |8 - sd/source/ui/dlg/PhotoAlbumDialog.cxx |4 sd/source/ui/dlg/PhotoAlbumDialog.hxx |4 sd/source/ui/dlg/dlgfield.cxx |6 - sd/source/ui/dlg/present.cxx |6 - sd/source/ui/inc/dlgfield.hxx |4 sd/source/ui/inc/present.hxx |6 - sfx2/source/dialog/mgetempl.cxx| 12 +- sfx2/source/dialog/newstyle.cxx|2 starmath/inc/dialog.hxx| 42 +++ starmath/inc/utility.hxx
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_2' - 103 commits - solenv/gbuild svl/source sw/inc sw/qa sw/source
Rebased ref, commits from common ancestor:
commit 1f350c614484dd38ba042ddaacf8dabd65a8f503
Author: Michael Stahl
AuthorDate: Mon Sep 17 12:01:46 2018 +0200
Commit: Michael Stahl
CommitDate: Mon Sep 17 14:41:06 2018 +0200
sw_redlinehide_2: replace SW_REDLINEHIDE with ExperimentalMode config
So we can get more testing & many bug reports.
Change-Id: I34fe456a58670baecf4fdf1a87da77aceab43891
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 08a086621031..cc4fe8616983 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -854,7 +855,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
m_aOption.IsFormatsOnly() ||
// sw_redlinehide: disable layout cache for now
- (getenv("SW_REDLINEHIDE") &&
!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+ (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
+!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
{
try
{
@@ -902,7 +904,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, con
// tdf#83260 ensure that the first call of CompressRedlines after loading
// the document is a no-op by calling it now
rDoc.getIDocumentRedlineAccess().CompressRedlines();
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{ // can't set it on the layout or view shell because it doesn't exist
yet
rDoc.GetDocumentRedlineManager().SetHideRedlines(!(nRedlineFlags &
RedlineFlags::ShowDelete));
}
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 26a16a31ce29..87ecd70566fb 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -26,6 +26,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -184,7 +186,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference <
task::XStatusIndicator >& xS
const OUString sShowChanges("ShowChanges");
RedlineFlags nRedlineFlags =
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags();
bool isShowChanges;
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{ // TODO: ideally this would be stored per-view...
isShowChanges =
!m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout()->IsHideRedlines();
}
@@ -414,7 +416,7 @@ ErrCode SwXMLWriter::Write_( const uno::Reference <
task::XStatusIndicator >& xS
nRedlineFlags = m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags();
nRedlineFlags &= ~RedlineFlags::ShowMask;
nRedlineFlags |= RedlineFlags::ShowInsert;
-if (getenv("SW_REDLINEHIDE"))
+if (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
nRedlineFlags |= RedlineFlags::ShowDelete;
}
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 06e3e8cc6bf0..e4b377fbaacb 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -637,7 +638,9 @@ void SwView::Execute(SfxRequest &rReq)
if( static_cast(pItem)->GetValue() )
nMode |= RedlineFlags::ShowDelete;
-if (getenv("SW_REDLINEHIDE")) // TODO...
+uno::Reference const xContext(
+comphelper::getProcessComponentContext());
+if
(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
m_pWrtShell->GetLayout()->SetHideRedlines(
!static_cast(pItem)->GetValue());
diff --git a/sw/source/uibase/uiview/viewstat.cxx
b/sw/source/uibase/uiview/viewstat.cxx
index 437fb12b11f0..49020bde88e1 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -281,7 +282,9 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case FN_REDLINE_SHOW:
{
-if (getenv("SW_REDLINEHIDE")) // TODO...
+uno::Reference const xContext(
+comphelper::getProcessComponentContext());
+if
(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
{
rSet.Put(SfxBoolItem(nWhich,
!m_pWrtShell->GetLayout()->IsHideRedlines()));
}
commit cd8ac156e6cea053127ecad6d7fba2a215fd1b64
Author: Michael Stahl
AuthorDate: Mon Sep 17 11:26:01 2018 +0200
Commit: Michael Stahl
CommitDate: M
[Libreoffice-commits] core.git: vcl/inc vcl/qt5
vcl/inc/qt5/Qt5FilePicker.hxx | 23 +--
vcl/qt5/Qt5FilePicker.cxx | 319 ++
2 files changed, 177 insertions(+), 165 deletions(-)
New commits:
commit 60a23d5d5f0963cd9bea7711ff4336418e3d6392
Author: Jan-Marek Glogowski
AuthorDate: Mon Sep 17 11:00:58 2018 +0200
Commit: Jan-Marek Glogowski
CommitDate: Mon Sep 17 14:26:43 2018 +0200
Qt5 just implement a non-native file picker
Since there is no way to retrieve the embedded native file dialog
from the Qt5 platfor abstraction, force the dialog in non-native
mode. This drops the 2nd option dialog completely.
While at it implement handling of the optional combo boxes in the
dialog.
Change-Id: I8d11e929a5f3b142dc0f5653fcc576231a1b0392
Reviewed-on: https://gerrit.libreoffice.org/60569
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index e1cb95344987..1564e2db1d0f 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -55,15 +55,16 @@ class Qt5FilePicker : public QObject, public
Qt5FilePicker_Base
protected:
css::uno::Reference m_xListener;
-QFileDialog* m_pFileDialog; ///< the non-extendable file picker dialog
+std::unique_ptr m_pFileDialog; ///< the non-native file
picker dialog
osl::Mutex m_aHelperMutex; ///< mutex used by the WeakComponentImplHelper
-QStringList m_aNamedFilterList; ///< named filter list for the QFileDialog
-QStringList m_aFilterTitleList; ///< the original filter titles
-QString m_aCurrentFilterTitle; ///< the current filter title
+QStringList m_aNamedFilterList; ///< to keep the original sequence
+QHash m_aTitleToFilterMap;
+QString m_aCurrentFilter;
-QDialog* m_pOptionsDialog; ///< an extra options dialog window
+QWidget* m_pExtraControls; ///< widget to contain extra custom controls
+QGridLayout* m_pLayout; ///< layout for extra custom controls
QLabel* m_pFilenameLabel; ///< label to display the filename
QLabel* m_pFilterLabel; ///< label to display the filter
QHash m_aCustomWidgetsMap; ///< map of SAL control
ID's to widget
@@ -246,27 +247,19 @@ Q_SIGNALS:
// XInitialization
void initializeSignal(const css::uno::Sequence& rArguments);
-// Destructor proxy
-void cleanupProxySignal();
-
private:
Qt5FilePicker(const Qt5FilePicker&) = delete;
Qt5FilePicker& operator=(const Qt5FilePicker&) = delete;
-// add a custom control widget to the options dialog
-void addCustomControl(QGridLayout* pLayout, sal_Int16 controlId);
+void addCustomControl(sal_Int16 controlId);
static QString getResString(const char* pRedId);
private Q_SLOTS:
-void cleanupProxy();
-
// emit XFilePickerListener controlStateChanged event
void filterSelected(const QString&);
// emit XFilePickerListener fileSelectionChanged event
-//void urlSelected(const QUrl &);
-
-void selectionChanged();
+void currentChanged(const QString&);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 94a36990f15a..2895bc34bc1c 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -78,14 +78,14 @@ uno::Sequence
FilePicker_getSupportedServiceNames()
Qt5FilePicker::Qt5FilePicker(QFileDialog::FileMode eMode)
: Qt5FilePicker_Base(m_aHelperMutex)
+, m_pFileDialog(new QFileDialog())
{
-m_pFileDialog = new QFileDialog();
-m_pOptionsDialog = new QDialog();
-
+m_pFileDialog->setOption(QFileDialog::DontUseNativeDialog);
m_pFileDialog->setFileMode(eMode);
-//m_pFileDialog->setWindowModality( Qt::WindowModal );
m_pFileDialog->setWindowModality(Qt::ApplicationModal);
-m_pOptionsDialog->setWindowModality(Qt::WindowModal);
+
+m_pExtraControls = new QWidget();
+m_pLayout = dynamic_cast(m_pFileDialog->layout());
setMultiSelectionMode(false);
@@ -145,27 +145,14 @@ Qt5FilePicker::Qt5FilePicker(QFileDialog::FileMode eMode)
SLOT(initializeSlot(const css::uno::Sequence&)),
Qt::BlockingQueuedConnection);
-// Destructor proxy
-connect(this, SIGNAL(cleanupProxySignal()), this, SLOT(cleanupProxy()),
-Qt::BlockingQueuedConnection);
-
// XFilePickerListener notifications
-connect(m_pFileDialog, SIGNAL(filterSelected(const QString&)), this,
+connect(m_pFileDialog.get(), SIGNAL(filterSelected(const QString&)), this,
SLOT(filterSelected(const QString&)));
-connect(m_pFileDialog, SIGNAL(selectionChanged()), this,
SLOT(selectionChanged()));
+connect(m_pFileDialog.get(), SIGNAL(currentChanged(const QString&)), this,
+SLOT(currentChanged(const QString&)));
}
-Qt5FilePicker::~Qt5FilePicker() { cleanupProxy(); }
-
-void Qt5FilePicker::cleanupProxy()
-{
-if (qApp->thread() != QThread::current
[Libreoffice-commits] core.git: solenv/vs
solenv/vs/LibreOffice.natvis |8
1 file changed, 8 insertions(+)
New commits:
commit 9fb1bd0365c469d33ddecda9602258a523f80885
Author: Mike Kaganski
AuthorDate: Mon Sep 17 11:47:43 2018 +0200
Commit: Mike Kaganski
CommitDate: Mon Sep 17 14:18:20 2018 +0200
Natvis: add boost::optional
Change-Id: I64c5ff89bedcee0d955e4aa12035302e413d0c02
Reviewed-on: https://gerrit.libreoffice.org/60567
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/solenv/vs/LibreOffice.natvis b/solenv/vs/LibreOffice.natvis
index 0a53a1161fad..409ccd5919c8 100644
--- a/solenv/vs/LibreOffice.natvis
+++ b/solenv/vs/LibreOffice.natvis
@@ -450,4 +450,12 @@
(SwLayoutFrame&)(*this)
+
+Optional not set
+{*reinterpret_cast<$T1
*>(m_storage.dummy_.data)}
+
+ m_initialized
+ *reinterpret_cast<$T1
*>(m_storage.dummy_.data)
+
+
___
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' - 2 commits - sax/source
sax/source/fastparser/fastparser.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 5f3a3de26fca5e3e37e4a08940fa4bf9da5e5ecc
Author: Michael Meeks
AuthorDate: Fri Sep 14 11:53:39 2018 +0100
Commit: Andras Timar
CommitDate: Mon Sep 17 13:47:54 2018 +0200
Join the thread only if launch succeeded.
Change-Id: Idee779cea587e11f6d0f7902182c9394e73d46eb
Reviewed-on: https://gerrit.libreoffice.org/60488
Tested-by: Jenkins
Reviewed-by: Michael Meeks
Reviewed-on: https://gerrit.libreoffice.org/60544
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 1c3ee79607af..9959489eed3f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -825,8 +825,8 @@ void FastSaxParserImpl::parseStream(const InputSource&
maStructSource)
{
rtl::Reference xParser;
xParser = new ParserThread(this);
-aEnsureFree.setThread(xParser);
xParser->launch();
+aEnsureFree.setThread(xParser);
bool done = false;
do {
rEntity.maConsumeResume.wait();
commit d06a8ce1434c1dcb45770e08395443771f57f1e9
Author: Michael Meeks
AuthorDate: Tue Sep 11 22:28:08 2018 +0100
Commit: Andras Timar
CommitDate: Mon Sep 17 13:47:43 2018 +0200
Ensure fastparser thread is joined in case of exceptions.
Change-Id: Ie0fb21776514a9a67e9fdff2ae856392cd711adb
Reviewed-on: https://gerrit.libreoffice.org/60542
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index a0b568c46e38..1c3ee79607af 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -754,6 +754,7 @@ namespace
private:
FastSaxParserImpl& m_rParser;
Entity& m_rEntity;
+rtl::Reference m_xParser;
public:
ParserCleanup(FastSaxParserImpl& rParser, Entity& rEntity)
: m_rParser(rParser)
@@ -765,6 +766,20 @@ namespace
//xmlFreeParserCtxt accepts a null arg
xmlFreeParserCtxt(m_rEntity.mpParser);
m_rParser.popEntity();
+joinThread();
+}
+void setThread(const rtl::Reference &xParser)
+{
+m_xParser = xParser;
+}
+void joinThread()
+{
+if (m_xParser.is())
+{
+rtl::Reference xToJoin = m_xParser;
+m_xParser.clear();
+xToJoin->join();
+}
}
};
}
@@ -810,6 +825,7 @@ void FastSaxParserImpl::parseStream(const InputSource&
maStructSource)
{
rtl::Reference xParser;
xParser = new ParserThread(this);
+aEnsureFree.setThread(xParser);
xParser->launch();
bool done = false;
do {
@@ -851,7 +867,7 @@ void FastSaxParserImpl::parseStream(const InputSource&
maStructSource)
rEntity.maUsedEvents.push(std::move(xEventList));
}
} while (!done);
-xParser->join();
+aEnsureFree.joinThread();
deleteUsedEvents();
// callbacks used inside XML_Parse may have caught an 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' - oovbaapi/ooo sc/source
oovbaapi/ooo/vba/excel/XButton.idl | 10 ++
sc/source/ui/vba/vbasheetobject.cxx | 20
sc/source/ui/vba/vbasheetobject.hxx |4
sc/source/ui/vba/vbasheetobjects.cxx | 35 ++-
sc/source/ui/vba/vbasheetobjects.hxx |3 ++-
sc/source/ui/vba/vbaworksheet.cxx| 26 +-
sc/source/ui/vba/vbaworksheet.hxx|4 +++-
7 files changed, 78 insertions(+), 24 deletions(-)
New commits:
commit cce35f341ac5db00d2c45a09e462f9bb65c949ca
Author: Michael Meeks
AuthorDate: Thu Sep 13 15:38:07 2018 +0100
Commit: Andras Timar
CommitDate: Mon Sep 17 13:46:58 2018 +0200
oovbaapi: hack Excel / OptionButton compatibility into Button for now.
Change-Id: I22d2d545a6201cbb89d430c65f66e0fea8794d83
Reviewed-on: https://gerrit.libreoffice.org/60543
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oovbaapi/ooo/vba/excel/XButton.idl
b/oovbaapi/ooo/vba/excel/XButton.idl
index 4a7f803ffc85..03ca15b0072f 100644
--- a/oovbaapi/ooo/vba/excel/XButton.idl
+++ b/oovbaapi/ooo/vba/excel/XButton.idl
@@ -29,8 +29,6 @@
module ooo { module vba { module excel {
-
-
/** Additional attributes for a push button drawing control (this interface
does not belong to ActiveX form controls).
*/
@@ -52,12 +50,16 @@ interface XButton : com::sun::star::uno::XInterface
ooo::vba::excel::XlOrientation. */
[attribute] long Orientation;
+/** OptionButton only hack - are we checked */
+[attribute] any Value;
+
+/** OptionButton only hack - another way to get the text */
+[attribute] string Text;
+
/** Access to text and text formatting of the button caption. */
XCharacters Characters( [in] any Start, [in] any Length );
};
-
-
}; }; };
#endif
diff --git a/sc/source/ui/vba/vbasheetobject.cxx
b/sc/source/ui/vba/vbasheetobject.cxx
index ac58ce940325..9e5b7856d6c4 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -504,6 +504,26 @@ void SAL_CALL ScVbaButton::setOrientation( sal_Int32
/*nOrientation*/ )
// not supported
}
+uno::Any SAL_CALL ScVbaButton::getValue()
+{
+return mxControlProps->getPropertyValue( "State" );
+}
+
+void SAL_CALL ScVbaButton::setValue( const uno::Any &nValue )
+{
+return mxControlProps->setPropertyValue( "State", nValue );
+}
+
+OUString SAL_CALL ScVbaButton::getText()
+{
+return mxControlProps->getPropertyValue( "Label" ).get< OUString >();
+}
+
+void SAL_CALL ScVbaButton::setText( const OUString &aText )
+{
+return mxControlProps->setPropertyValue( "Label", uno::Any( aText ) );
+}
+
// XButton methods
uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const
uno::Any& rStart, const uno::Any& rLength )
diff --git a/sc/source/ui/vba/vbasheetobject.hxx
b/sc/source/ui/vba/vbasheetobject.hxx
index 721bcf99a243..481490f97ae8 100644
--- a/sc/source/ui/vba/vbasheetobject.hxx
+++ b/sc/source/ui/vba/vbasheetobject.hxx
@@ -199,6 +199,10 @@ public:
virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) override;
virtual sal_Int32 SAL_CALL getOrientation() override;
virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) override;
+virtual css::uno::Any SAL_CALL getValue() override;
+virtual void SAL_CALL setValue( const css::uno::Any &nValue ) override;
+virtual OUString SAL_CALL getText() override;
+virtual void SAL_CALL setText( const OUString &aText ) override;
// XButton methods
css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters(
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx
b/sc/source/ui/vba/vbasheetobjects.cxx
index 86343729b4a8..1876b30e9127 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -371,7 +371,8 @@ public:
const uno::Reference< frame::XModel >& rxModel,
const uno::Reference< sheet::XSpreadsheet >& rxSheet,
const uno::Type& rVbaType,
-const OUString& rModelServiceName );
+const OUString& rModelServiceName,
+sal_Int16 /* css::form::FormComponentType */ eType );
protected:
/// @throws uno::RuntimeException
@@ -386,6 +387,7 @@ protected:
protected:
uno::Reference< container::XIndexContainer > mxFormIC;
OUString maModelServiceName;
+sal_Int16 /* css::form::FormComponentType */ meType;
};
ScVbaControlContainer::ScVbaControlContainer(
@@ -394,9 +396,11 @@ ScVbaControlContainer::ScVbaControlContainer(
const uno::Reference< frame::XModel >& rxModel,
const uno::Reference< sheet::XSpreadsheet >& rxSheet,
const uno::Type& rVbaType,
-const OUString& rModelServiceName ) :
+const OUString& rModelServiceName,
+sal_Int16 /* css::form::FormComponentType */ eType ) :
ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ),
-maModelServiceName( rModelServiceName )
+maMod
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/0200.xhp |2
source/text/shared/explorer/database/02010100.xhp | 228 +++---
source/text/shared/explorer/database/02010101.xhp | 18 -
source/text/shared/explorer/database/0400.xhp |4
source/text/shared/explorer/database/0403.xhp | 12 -
source/text/shared/explorer/database/0500.xhp |4
source/text/shared/explorer/database/0501.xhp |6
source/text/shared/explorer/database/0503.xhp |6
source/text/shared/explorer/database/0501.xhp | 20 -
source/text/shared/explorer/database/05010100.xhp |8
source/text/shared/explorer/database/0502.xhp | 12 -
11 files changed, 160 insertions(+), 160 deletions(-)
New commits:
commit f7606a55bb58a5c30dce04427340719856e66ac9
Author: Alexander Thurgood
AuthorDate: Fri Sep 14 12:45:37 2018 +0200
Commit: Olivier Hallot
CommitDate: Mon Sep 17 13:41:55 2018 +0200
DB help content clean-up
Change-Id: Id5a3f2bd17d4e6a159fe6322eb9cec8012cc9d51
Reviewed-on: https://gerrit.libreoffice.org/60487
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/shared/explorer/database/0200.xhp
b/source/text/shared/explorer/database/0200.xhp
index 281751778..d73d23d62 100644
--- a/source/text/shared/explorer/database/0200.xhp
+++ b/source/text/shared/explorer/database/0200.xhp
@@ -35,7 +35,7 @@
printing; queries (Base)
queries; printing (Base)
mw added "(Base)" to all entries Queries
-A "query" is a
special view of a table. A query can display chosen records or chosen fields
within records; it can also sort those records. A query can apply to one table
to multiple tables, if they are linked by common data
fields.i73680
+A "query" is a
special view of a table. A query can display chosen records or chosen fields
within records; it can also sort those records. A query can apply to one table
or to multiple tables, if they are linked by common data
fields.i73680
diff --git a/source/text/shared/explorer/database/02010100.xhp
b/source/text/shared/explorer/database/02010100.xhp
index d388ddc8a..6825e44ed 100644
--- a/source/text/shared/explorer/database/02010100.xhp
+++ b/source/text/shared/explorer/database/02010100.xhp
@@ -61,7 +61,7 @@
The
Design View
To create a
query, click the Queries icon in a database document, then click
Create Query in Design View.
-The lower pane
of the Design View is where you define
the query. To define a query, specify the database field
names to include and the criteria for displaying the fields. To rearrange the
columns in the lower pane of the Design View, drag a column header to a new
location, or select the column and press Command
+The lower pane
of the Design View is where you define
the query. To define a query, specify the database field
names to include and the criteria for displaying the fields. To rearrange the
columns in the lower pane of the Design View, drag a column header to a new
location, or select the column and press Command
Ctrl+arrow
key.
In the top of
the query Design View window, the icons of the Query Design Bar and the
Design bar are displayed.
If you want to
test a query, double-click the query name in the database document. The query
result is displayed in a table similar to the Data Source View. Note: the table
displayed is only temporary.
@@ -121,13 +121,13 @@
Table
Relations
If there are
data relations between a field name in one table and a field name in another
table, you can use these relations for your query.
-If, for
example, you have a spreadsheet for articles identified by an article number,
and a spreadsheet for customers in which you record all articles that a
customer orders using the corresponding article numbers, then there is a
relationship between the two "article number" data fields. If you now want to
create a query that returns all articles that a customer has ordered, you must
retrieve data from two spreadsheets. To do this, you must tell $[officename]
what the relationship exists between the data in the two
spreadsheets.
-To do this,
click a field name in a table (for example, the field name "Item-Number" from
the Customer table), hold down the mouse button and then drag the field name to
the field name of the other table ("Item-Number" from the Item table). When you
release the mouse button, a line connecting the two fields in the two windows
appears. The corresponding condition that the content of the two field names
must be identical is entered in the resulting SQL query.
+If, for
example, you have a spreadsheet for articles identified by an article number,
and a spreadsheet for customers in which you record all articles that a
customer orders using the corresponding article numbers, then there is a
relationship between the two "article number" data fields. If you now want to
create a query that returns all articles that a customer has ordered, you must
r
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e41e2bbce9c5351e93b244ff5aedc538b4062184 Author: Alexander Thurgood AuthorDate: Fri Sep 14 12:45:37 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Sep 17 13:41:55 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - DB help content clean-up Change-Id: Id5a3f2bd17d4e6a159fe6322eb9cec8012cc9d51 Reviewed-on: https://gerrit.libreoffice.org/60487 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 94177b1022a9..f7606a55bb58 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 94177b1022a9a4f49743ab4d97169ff42315eea5 +Subproject commit f7606a55bb58a5c30dce04427340719856e66ac9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/Kit.cpp net/Socket.hpp
kit/Kit.cpp|6 --
net/Socket.hpp |4
2 files changed, 10 deletions(-)
New commits:
commit 7fd28d5676642332d537a90de5194740cedd4cec
Author: Tor Lillqvist
AuthorDate: Mon Sep 17 13:44:29 2018 +0300
Commit: Miklos Vajna
CommitDate: Mon Sep 17 12:51:07 2018 +0200
Revert part of my iOS related commit, causes compilation warning with Clang
Won't actually be needed anyway, the way the code is going in my work
tree.
Change-Id: I4480ed59fe96ddcfad8483517f2a23452606f332
Reviewed-on: https://gerrit.libreoffice.org/60576
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f67617a8f..1161507c2 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2054,12 +2054,6 @@ protected:
{
std::string message(data.data(), data.size());
-handleMessage(message);
-}
-
-void handleMessage(const std::string& message) override
-{
-
#if 0 // FIXME might be needed for unit tests #ifndef KIT_IN_PROCESS
if (UnitKit::get().filterKitMessage(ws, message))
{
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 3e86055e0..3a081d526 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -340,10 +340,6 @@ public:
/// Append pretty printed internal state to a line
virtual void dumpState(std::ostream& os) { os << "\n"; }
-
-virtual void handleMessage(const std::string& /*message*/)
-{
-}
};
/// Handles non-blocking socket event polling.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/qt5-win+mac' - 107 commits - animations/source basctl/source basegfx/source basegfx/test basic/source bin/ios-mapfile-statistics bin/oss-fuzz-build.sh b
Rebased ref, commits from common ancestor:
commit 71749d19a511da3ca81748f0b8a887f8ae08b8e9
Author: Jan-Marek Glogowski
AuthorDate: Mon Sep 17 11:01:59 2018 +0200
Commit: Jan-Marek Glogowski
CommitDate: Mon Sep 17 11:58:42 2018 +0200
Qt5 use LO provided native file pickers
This uses the native file pickers on Windows and MacOSX.
Change-Id: Ic836d3ed8de0760c6c94c68d61f6eaa96f773000
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index ae29d4054bd9..ec30f06b7a9f 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -85,7 +85,7 @@ endif
$(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
vcl/qt5/Qt5Bitmap \
vcl/qt5/Qt5Data \
-vcl/qt5/Qt5FilePicker \
+$(if $(USING_X11),vcl/qt5/Qt5FilePicker) \
vcl/qt5/Qt5Font \
vcl/qt5/Qt5FontFace \
vcl/qt5/Qt5Frame \
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 8557834064d8..334aba4fbdea 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -211,17 +211,27 @@ void Qt5Instance::ProcessEvent(SalUserEvent aEvent)
}
css::uno::Reference
-Qt5Instance::createFilePicker(const
css::uno::Reference&)
+Qt5Instance::createFilePicker(const
css::uno::Reference& cntxt)
{
+#if (defined _WIN32 || defined MACOSX)
+return SalInstance::createFilePicker(cntxt);
+#else
+(void)cntxt;
return css::uno::Reference(
new Qt5FilePicker(QFileDialog::ExistingFile));
+#endif
}
css::uno::Reference
-Qt5Instance::createFolderPicker(const
css::uno::Reference&)
+Qt5Instance::createFolderPicker(const
css::uno::Reference& cntxt)
{
+#if (defined _WIN32 || defined MACOSX)
+return SalInstance::createFolderPicker(cntxt);
+#else
+(void)cntxt;
return css::uno::Reference(
new Qt5FilePicker(QFileDialog::Directory));
+#endif
}
extern "C" {
commit a3485c301e222f19ff3874edcd098389d796823d
Author: Jan-Marek Glogowski
AuthorDate: Thu Sep 13 12:23:36 2018 +0200
Commit: Jan-Marek Glogowski
CommitDate: Mon Sep 17 11:58:41 2018 +0200
Unify sal plugin loaders
Change-Id: Ic099761eaff80349e985ccf62e3f4aa6b2e98022
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index e3c33af5d774..8fd852a5cb53 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -259,8 +259,6 @@ public:
platform specific data structures.
@attention The initialization of the application itself is done in Init()
-
-@seeInitSalData is implemented by platform specific code.
*/
Application();
@@ -268,9 +266,6 @@ public:
Deinitializes the LibreOffice global instance data structure, then
deinitializes any platform specific data structures.
-
- @see ImplDeInitSVData deinitializes the global instance data,
-DeInitSalData is implemented by platform specific code
*/
virtual ~Application();
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index bcb5733ee12a..1b9f24a6c8a6 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17915,7 +17915,6 @@ vcl/osx/salinst.cxx
vcl/osx/salmenu.cxx
vcl/osx/salnativewidgets.cxx
vcl/osx/salobj.cxx
-vcl/osx/salplug.cxx
vcl/osx/salprn.cxx
vcl/osx/salsys.cxx
vcl/osx/saltimer.cxx
@@ -17958,6 +17957,7 @@ vcl/source/app/dndhelp.cxx
vcl/source/app/help.cxx
vcl/source/app/i18nhelp.cxx
vcl/source/app/idle.cxx
+vcl/source/app/salplug.cxx
vcl/source/app/salusereventlist.cxx
vcl/source/app/salvtables.cxx
vcl/source/app/scheduler.cxx
@@ -18323,7 +18323,6 @@ vcl/unx/generic/gdi/xrender_peer.cxx
vcl/unx/generic/gdi/xrender_peer.hxx
vcl/unx/generic/glyphs/freetype_glyphcache.cxx
vcl/unx/generic/glyphs/glyphcache.cxx
-vcl/unx/generic/plugadapt/salplug.cxx
vcl/unx/generic/print/bitmap_gfx.cxx
vcl/unx/generic/print/common_gfx.cxx
vcl/unx/generic/print/genprnpsp.cxx
@@ -18447,7 +18446,6 @@ vcl/unx/kde4/tst_exclude_posted_events.hxx
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
vcl/unx/x11/x11sys.cxx
vcl/unx/x11/xlimits.cxx
-vcl/win/salplug.cxx
vcl/win/app/saldata.cxx
vcl/win/app/salinfo.cxx
vcl/win/app/salinst.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 184c84248eb0..e75ff64b2b34 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
lcms2 \
mdds_headers \
))
+
ifeq ($(DISABLE_GUI),)
$(eval $(call gb_Library_use_externals,vcl,\
epoxy \
@@ -474,7 +475,7 @@ vcl_headless_freetype_code=\
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Library_add_exception_objects,vcl,\
-vcl/unx/generic/plugadapt/salplug \
+vcl/source/app/salplug \
vcl/unx/generic/printer/jobdata \
vcl/unx/generic/printer/ppdparser \
vcl/unx/generic/gdi/nativewindowhandleprovider \
@@ -520,8 +521,10 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lpthread \
))
endif
-else
- $(eval $(call gb_Library_add_exception_obj
[Libreoffice-commits] core.git: oox/source
oox/source/shape/WpsContext.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 07b3bfb125fae70e0ab796a929a4f2abe4937912
Author: Caolán McNamara
AuthorDate: Mon Sep 17 09:01:59 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 11:37:03 2018 +0200
ofz#10395 Null-dereference
Change-Id: I7bde5987a51949d60174335327652186e0ad8998
Reviewed-on: https://gerrit.libreoffice.org/60559
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index a5ed73160ef9..040d8df1e655 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -179,11 +179,14 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
if (rAttribs.hasAttribute(XML_prst))
{
uno::Reference xPropertySet(mxShape,
uno::UNO_QUERY);
-oox::OptValue presetShapeName =
rAttribs.getString(XML_prst);
-const OUString& preset = presetShapeName.get();
-comphelper::SequenceAsHashMap
aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
-aCustomShapeGeometry["PresetTextWarp"] <<= preset;
-xPropertySet->setPropertyValue("CustomShapeGeometry",
uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList()));
+if (xPropertySet.is())
+{
+oox::OptValue presetShapeName =
rAttribs.getString(XML_prst);
+const OUString& preset = presetShapeName.get();
+comphelper::SequenceAsHashMap
aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry"));
+aCustomShapeGeometry["PresetTextWarp"] <<= preset;
+xPropertySet->setPropertyValue("CustomShapeGeometry",
uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList()));
+}
}
break;
case XML_txbx:
___
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' - svx/source
svx/source/sdr/properties/measureproperties.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit a3fa7c4e04c489f8d8ec6db3385e965900d801a3 Author: Armin Le Grand AuthorDate: Sun Sep 16 10:49:42 2018 +0200 Commit: Armin Le Grand CommitDate: Mon Sep 17 11:27:34 2018 +0200 tdf#118203 Avoid endless recussion in MeasureObject Change-Id: I1e6fff80e7b6d36830f61387cc5245fc54877d95 Reviewed-on: https://gerrit.libreoffice.org/60546 Tested-by: Jenkins Reviewed-by: Julien Nabet Reviewed-by: Armin Le Grand (cherry picked from commit d357e50fa1734da0bf341dbd49fc0596011bdfe3) Reviewed-on: https://gerrit.libreoffice.org/60557 Tested-by: Xisco Faulí diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index ddf0159437b9..a62f49ae0d59 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -88,15 +88,15 @@ namespace sdr // get access to dimension line object SdrMeasureObj& rObj = static_cast(GetSdrObject()); +// call parent +TextProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); + // local changes // mark dimension line text as changed (dirty) in the dimension line object rObj.SetTextDirty(); // tdf#98525 ask the dimension line object to redraw the changed text rObj.UndirtyText(); - -// call parent -TextProperties::SetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr); } void MeasureProperties::ForceDefaultAttributes() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/modcfg.hxx | 30 +++---
sw/source/uibase/config/modcfg.cxx | 50 ++---
2 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 487a05e898a135e477278afca2abbd57acb5c8fc
Author: Miklos Vajna
AuthorDate: Mon Sep 17 09:16:24 2018 +0200
Commit: Miklos Vajna
CommitDate: Mon Sep 17 11:22:45 2018 +0200
sw: prefix members of SwRevisionConfig
Change-Id: I51150783d0e624ae33efdd36857c2e26fb970ae0
Reviewed-on: https://gerrit.libreoffice.org/60558
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 47e49c2f8784..dab488078d15 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -61,14 +61,14 @@ class SwRevisionConfig : public utl::ConfigItem
{
friend class SwModuleOptions;
-AuthorCharAttr aInsertAttr;
//Revision/TextDisplay/Insert/Attribute // Redlining: author character
attributes
+AuthorCharAttr m_aInsertAttr;
//Revision/TextDisplay/Insert/Attribute // Redlining: author character
attributes
//Revision/TextDisplay/Insert/Color
-AuthorCharAttr aDeletedAttr; //Revision/TextDisplay/Delete/Attribute
+AuthorCharAttr m_aDeletedAttr;
//Revision/TextDisplay/Delete/Attribute
//Revision/TextDisplay/Delete/Color
-AuthorCharAttr aFormatAttr;
//Revision/TextDisplay/ChangeAttribute/Attribute
+AuthorCharAttr m_aFormatAttr;
//Revision/TextDisplay/ChangeAttribute/Attribute
//Revision/TextDisplay/ChangeAttribute/Color
-sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark
-Color aMarkColor; //Revision/LinesChanged/Color
+sal_uInt16 m_nMarkAlign; //Revision/LinesChanged/Mark
+Color m_aMarkColor; //Revision/LinesChanged/Color
static const css::uno::Sequence& GetPropertyNames();
@@ -238,24 +238,24 @@ public:
voidSetTableVInsert( sal_uInt16 nSet ) {
m_aTableConfig.nTableVInsert = nSet;
m_aTableConfig.SetModified();}
-const AuthorCharAttr&GetInsertAuthorAttr() const { return
m_aRevisionConfig.aInsertAttr; }
-voidSetInsertAuthorAttr( AuthorCharAttr const &rAttr ) {
m_aRevisionConfig.aInsertAttr = rAttr;
+const AuthorCharAttr&GetInsertAuthorAttr() const { return
m_aRevisionConfig.m_aInsertAttr; }
+voidSetInsertAuthorAttr( AuthorCharAttr const &rAttr ) {
m_aRevisionConfig.m_aInsertAttr = rAttr;
m_aRevisionConfig.SetModified();}
-const AuthorCharAttr&GetDeletedAuthorAttr() const { return
m_aRevisionConfig.aDeletedAttr; }
-voidSetDeletedAuthorAttr( AuthorCharAttr const &rAttr ) {
m_aRevisionConfig.aDeletedAttr = rAttr;
+const AuthorCharAttr&GetDeletedAuthorAttr() const { return
m_aRevisionConfig.m_aDeletedAttr; }
+voidSetDeletedAuthorAttr( AuthorCharAttr const &rAttr ) {
m_aRevisionConfig.m_aDeletedAttr = rAttr;
m_aRevisionConfig.SetModified();}
-const AuthorCharAttr&GetFormatAuthorAttr() const { return
m_aRevisionConfig.aFormatAttr; }
-voidSetFormatAuthorAttr( AuthorCharAttr const &rAttr ) {
m_aRevisionConfig.aFormatAttr = rAttr;
+const AuthorCharAttr&GetFormatAuthorAttr() const { return
m_aRevisionConfig.m_aFormatAttr; }
+voidSetFormatAuthorAttr( AuthorCharAttr const &rAttr ) {
m_aRevisionConfig.m_aFormatAttr = rAttr;
m_aRevisionConfig.SetModified();}
-sal_uInt16 GetMarkAlignMode() const { return
m_aRevisionConfig.nMarkAlign; }
-voidSetMarkAlignMode(sal_uInt16 nMode) {
m_aRevisionConfig.nMarkAlign = nMode;
+sal_uInt16 GetMarkAlignMode() const { return
m_aRevisionConfig.m_nMarkAlign; }
+voidSetMarkAlignMode(sal_uInt16 nMode) {
m_aRevisionConfig.m_nMarkAlign = nMode;
m_aRevisionConfig.SetModified();}
-const Color&GetMarkAlignColor() const { return
m_aRevisionConfig.aMarkColor; }
-voidSetMarkAlignColor(const Color &rColor) {
m_aRevisionConfig.aMarkColor = rColor;
+const Color&GetMarkAlignColor() const { return
m_aRevisionConfig.m_aMarkColor; }
+voidSetMarkAlignColor(const Color &rColor) {
m_aRevisionConfig.m_aMarkColor = rColor;
m_aRevisionConfig.SetModified();}
boolIsInsWithCaption(bool bHTML) const
diff --git a/sw/source/uibase/
[Libreoffice-commits] core.git: compilerplugins/clang cppcanvas/source desktop/source include/vcl sc/source sd/source sw/source uui/source vcl/backendtest vcl/inc vcl/opengl vcl/source vcl/unx writerf
compilerplugins/clang/staticconstfield.cxx | 66 +++--
compilerplugins/clang/test/staticconstfield.cxx | 71 ++-
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 29 +-
desktop/source/splash/splash.cxx |4
include/vcl/opengl/OpenGLContext.hxx |1
sc/source/ui/dbgui/tpsubt.cxx|2
sc/source/ui/inc/tpsubt.hxx |2
sd/source/ui/sidebar/PreviewValueSet.cxx |9 +
sd/source/ui/sidebar/PreviewValueSet.hxx |2
sw/source/core/inc/frmtool.hxx |1
sw/source/core/layout/frmtool.cxx| 11 +-
uui/source/secmacrowarnings.cxx |3
uui/source/secmacrowarnings.hxx |1
vcl/backendtest/VisualBackendTest.cxx| 21 ++--
vcl/inc/unx/glyphcache.hxx |2
vcl/opengl/win/gdiimpl.cxx |6 -
vcl/opengl/x11/gdiimpl.cxx |2
vcl/source/gdi/pdfwriter_impl.cxx| 10 --
vcl/source/gdi/pdfwriter_impl.hxx|6 -
vcl/source/opengl/OpenGLContext.cxx |1
vcl/unx/generic/glyphs/glyphcache.cxx|7 -
vcl/unx/generic/print/bitmap_gfx.cxx |9 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 12 +-
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx |4
writerfilter/source/dmapper/GraphicImport.cxx|9 +
25 files changed, 184 insertions(+), 107 deletions(-)
New commits:
commit 05db125c57ea3c8f04a304561209c32cc5c45a67
Author: Noel Grandin
AuthorDate: Thu Sep 13 15:00:56 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 17 10:52:39 2018 +0200
loplugin:staticconstfield improvements
Change-Id: Ia0a19736dfd4500bb17b04c072710f8ee8744031
Reviewed-on: https://gerrit.libreoffice.org/60526
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/staticconstfield.cxx
b/compilerplugins/clang/staticconstfield.cxx
index 7276d7e05c49..bfc32a8c059f 100644
--- a/compilerplugins/clang/staticconstfield.cxx
+++ b/compilerplugins/clang/staticconstfield.cxx
@@ -33,22 +33,66 @@ bool
StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
return true;
if (!init->getMember())
return true;
-auto tc = loplugin::TypeCheck(init->getMember()->getType());
-if (!tc.Const().Class("OUString").Namespace("rtl").GlobalNamespace()
-&& !tc.Const().Class("OString").Namespace("rtl").GlobalNamespace())
+auto type = init->getMember()->getType();
+auto tc = loplugin::TypeCheck(type);
+bool found = false;
+if (!tc.Const())
return true;
-if (auto constructExpr = dyn_cast(init->getInit()))
+if (tc.Const().Class("OUString").Namespace("rtl").GlobalNamespace()
+|| tc.Const().Class("OString").Namespace("rtl").GlobalNamespace())
{
-if (constructExpr->getNumArgs() >= 1 &&
isa(constructExpr->getArg(0)))
+if (auto constructExpr = dyn_cast(init->getInit()))
{
-report(DiagnosticsEngine::Warning, "string field can be static
const",
- init->getSourceLocation())
-<< init->getSourceRange();
-report(DiagnosticsEngine::Note, "field here",
init->getMember()->getLocation())
-<< init->getMember()->getSourceRange();
+if (constructExpr->getNumArgs() >= 1
+&& isa(constructExpr->getArg(0)))
+found = true;
}
}
-return RecursiveASTVisitor::TraverseConstructorInitializer(init);
+else if (type->isIntegerType())
+{
+if (isa(init->getInit()->IgnoreParenImpCasts()))
+found = true;
+// isIntegerType includes bool
+else if
(isa(init->getInit()->IgnoreParenImpCasts()))
+found = true;
+}
+else if (type->isFloatingType())
+{
+if (isa(init->getInit()->IgnoreParenImpCasts()))
+found = true;
+}
+else if (type->isEnumeralType())
+{
+if (auto declRefExpr =
dyn_cast(init->getInit()->IgnoreParenImpCasts()))
+{
+if (isa(declRefExpr->getDecl()))
+found = true;
+}
+}
+
+// If we find more than one non-copy-move constructor, we can't say for
sure if a member can be static
+// because it could be initialised differently in each constructor.
+if (auto cxxRecordDecl =
dyn_cast(init->getMember()->getParent()))
+{
+int cnt = 0;
+for (auto it = cxxRecordDecl->ctor_begin(); it !=
cxxRecordDecl->ctor_end(); ++it)
+{
+if (!it->isCopyOrMoveConstructor())
+cnt++;
+}
+if (c
[Libreoffice-commits] core.git: oovbaapi/ooo sc/source
oovbaapi/ooo/vba/excel/XButton.idl | 10 ++
sc/source/ui/vba/vbasheetobject.cxx | 20
sc/source/ui/vba/vbasheetobject.hxx |4
sc/source/ui/vba/vbasheetobjects.cxx | 35 ++-
sc/source/ui/vba/vbasheetobjects.hxx |3 ++-
sc/source/ui/vba/vbaworksheet.cxx| 26 +-
sc/source/ui/vba/vbaworksheet.hxx|4 +++-
7 files changed, 78 insertions(+), 24 deletions(-)
New commits:
commit be9b83445ec19346a4d5c830c955ed573469591a
Author: Michael Meeks
AuthorDate: Thu Sep 13 15:38:07 2018 +0100
Commit: Michael Meeks
CommitDate: Mon Sep 17 10:49:38 2018 +0200
oovbaapi: hack Excel / OptionButton compatibility into Button for now.
Change-Id: I22d2d545a6201cbb89d430c65f66e0fea8794d83
Reviewed-on: https://gerrit.libreoffice.org/60541
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/oovbaapi/ooo/vba/excel/XButton.idl
b/oovbaapi/ooo/vba/excel/XButton.idl
index 4a7f803ffc85..03ca15b0072f 100644
--- a/oovbaapi/ooo/vba/excel/XButton.idl
+++ b/oovbaapi/ooo/vba/excel/XButton.idl
@@ -29,8 +29,6 @@
module ooo { module vba { module excel {
-
-
/** Additional attributes for a push button drawing control (this interface
does not belong to ActiveX form controls).
*/
@@ -52,12 +50,16 @@ interface XButton : com::sun::star::uno::XInterface
ooo::vba::excel::XlOrientation. */
[attribute] long Orientation;
+/** OptionButton only hack - are we checked */
+[attribute] any Value;
+
+/** OptionButton only hack - another way to get the text */
+[attribute] string Text;
+
/** Access to text and text formatting of the button caption. */
XCharacters Characters( [in] any Start, [in] any Length );
};
-
-
}; }; };
#endif
diff --git a/sc/source/ui/vba/vbasheetobject.cxx
b/sc/source/ui/vba/vbasheetobject.cxx
index ac58ce940325..9e5b7856d6c4 100644
--- a/sc/source/ui/vba/vbasheetobject.cxx
+++ b/sc/source/ui/vba/vbasheetobject.cxx
@@ -504,6 +504,26 @@ void SAL_CALL ScVbaButton::setOrientation( sal_Int32
/*nOrientation*/ )
// not supported
}
+uno::Any SAL_CALL ScVbaButton::getValue()
+{
+return mxControlProps->getPropertyValue( "State" );
+}
+
+void SAL_CALL ScVbaButton::setValue( const uno::Any &nValue )
+{
+return mxControlProps->setPropertyValue( "State", nValue );
+}
+
+OUString SAL_CALL ScVbaButton::getText()
+{
+return mxControlProps->getPropertyValue( "Label" ).get< OUString >();
+}
+
+void SAL_CALL ScVbaButton::setText( const OUString &aText )
+{
+return mxControlProps->setPropertyValue( "Label", uno::Any( aText ) );
+}
+
// XButton methods
uno::Reference< excel::XCharacters > SAL_CALL ScVbaButton::Characters( const
uno::Any& rStart, const uno::Any& rLength )
diff --git a/sc/source/ui/vba/vbasheetobject.hxx
b/sc/source/ui/vba/vbasheetobject.hxx
index 721bcf99a243..481490f97ae8 100644
--- a/sc/source/ui/vba/vbasheetobject.hxx
+++ b/sc/source/ui/vba/vbasheetobject.hxx
@@ -199,6 +199,10 @@ public:
virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) override;
virtual sal_Int32 SAL_CALL getOrientation() override;
virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) override;
+virtual css::uno::Any SAL_CALL getValue() override;
+virtual void SAL_CALL setValue( const css::uno::Any &nValue ) override;
+virtual OUString SAL_CALL getText() override;
+virtual void SAL_CALL setText( const OUString &aText ) override;
// XButton methods
css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters(
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx
b/sc/source/ui/vba/vbasheetobjects.cxx
index 86343729b4a8..1876b30e9127 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -371,7 +371,8 @@ public:
const uno::Reference< frame::XModel >& rxModel,
const uno::Reference< sheet::XSpreadsheet >& rxSheet,
const uno::Type& rVbaType,
-const OUString& rModelServiceName );
+const OUString& rModelServiceName,
+sal_Int16 /* css::form::FormComponentType */ eType );
protected:
/// @throws uno::RuntimeException
@@ -386,6 +387,7 @@ protected:
protected:
uno::Reference< container::XIndexContainer > mxFormIC;
OUString maModelServiceName;
+sal_Int16 /* css::form::FormComponentType */ meType;
};
ScVbaControlContainer::ScVbaControlContainer(
@@ -394,9 +396,11 @@ ScVbaControlContainer::ScVbaControlContainer(
const uno::Reference< frame::XModel >& rxModel,
const uno::Reference< sheet::XSpreadsheet >& rxSheet,
const uno::Type& rVbaType,
-const OUString& rModelServiceName ) :
+const OUString& rModelServiceName,
+sal_Int16 /* css::form::FormComponentType */ eType ) :
ScVbaObjectContainer( rxParent, rxContext, rxModel, rxSheet, rVbaType ),
-maModelServiceName( rModelServiceName )
+ma
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgtools.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 694a433d5fbc9ab77dd37e7be9e79f3d3776eb24
Author: Noel Grandin
AuthorDate: Mon Sep 17 10:08:41 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 17 10:09:53 2018 +0200
remove duplicate line
accidentally introduced with
commit 23f9d2b092989c5f105144083e79066e3070afbc
match_colorKeyword should be using static const lookup table
Change-Id: I64c85504af6edba9f5e6a20b20ef245d43fd611b
diff --git a/svgio/source/svgreader/svgtools.cxx
b/svgio/source/svgreader/svgtools.cxx
index 9eec14a75ec0..27d14eeda9f1 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -636,7 +636,6 @@ namespace svgio
typedef std::pair< OUString, Color > ColorTokenValueType;
static const ColorTokenMapper aColorTokenMapperList {
{ ColorTokenValueType(OUString("aliceblue"), Color(240, 248,
255)) },
-{ ColorTokenValueType(OUString("aliceblue"), Color(240, 248,
255) ) },
{ ColorTokenValueType(OUString("antiquewhite"), Color(250,
235, 215) ) },
{ ColorTokenValueType(OUString("aqua"), Color( 0, 255, 255) )
},
{ ColorTokenValueType(OUString("aquamarine"), Color(127, 255,
212) ) },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source offapi/com sfx2/source xmlsecurity/source
cui/source/dialogs/SignSignatureLineDialog.cxx | 15 -
offapi/com/sun/star/security/CertificateKind.idl|8 ++
offapi/com/sun/star/security/XDocumentDigitalSignatures.idl |9 +++
sfx2/source/doc/objserv.cxx | 34 +++-
xmlsecurity/source/component/documentdigitalsignatures.cxx | 28 -
5 files changed, 65 insertions(+), 29 deletions(-)
New commits:
commit 9b4c6892630a98c1218aca72827f718184a4b5f0
Author: Samuel Mehrbrodt
AuthorDate: Fri Sep 14 10:30:36 2018 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Sep 17 10:05:37 2018 +0200
tdf#118569 Signature Line: When signing ooxml, only show X.509 certificates
Also fixes a bug where signing was aborted after saving as docx.
Change-Id: Ic42b7de2400be0bc55da03b017a545ceaedef9f9
Reviewed-on: https://gerrit.libreoffice.org/60480
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 9b3be762b2d9..72c4e5f2e6a3 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -20,6 +20,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -29,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -116,10 +119,20 @@
SignSignatureLineDialog::SignSignatureLineDialog(weld::Widget* pParent, Referenc
IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, weld::Button&,
void)
{
+// Document needs to be saved before selecting a certificate
+SfxObjectShell* pShell = SfxObjectShell::Current();
+if (!pShell->PrepareForSigning(m_xDialog.get()))
+return;
+
Reference
xSigner(DocumentDigitalSignatures::createWithVersion(
comphelper::getProcessComponentContext(), "1.2"));
OUString aDescription;
-Reference xSignCertificate =
xSigner->selectSigningCertificate(aDescription);
+CertificateKind certificateKind = CertificateKind_NONE;
+// When signing ooxml, we only want X.509 certificates
+if (pShell->GetMedium()->GetFilter()->IsAlienFormat())
+certificateKind = CertificateKind_X509;
+Reference xSignCertificate
+= xSigner->selectSigningCertificateWithType(certificateKind,
aDescription);
if (xSignCertificate.is())
{
diff --git a/offapi/com/sun/star/security/CertificateKind.idl
b/offapi/com/sun/star/security/CertificateKind.idl
index 9f6230452c4b..111591866875 100644
--- a/offapi/com/sun/star/security/CertificateKind.idl
+++ b/offapi/com/sun/star/security/CertificateKind.idl
@@ -25,7 +25,13 @@ enum CertificateKind
/** OpenPGP format of a certificate
*/
-OPENPGP
+OPENPGP,
+
+/** No format specified
+ *
+ * @since LibreOffice 6.2
+ */
+NONE
};
} ; } ; } ; } ;
diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index 0e4d6c82d553..ebd42c6ecef6 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -168,6 +168,15 @@ interface XDocumentDigitalSignatures :
com::sun::star::uno::XInterface
*/
com::sun::star::security::XCertificate selectSigningCertificate( [out]
string Description );
+/** This shows the certificate selection dialog and allows to only select
the certificate
+ without actually signing the document. Only certificates of the given
type will be shown.
+
+ @since LibreOffice 6.2
+ */
+com::sun::star::security::XCertificate selectSigningCertificateWithType(
+[in] CertificateKind certificateKind,
+[out] string Description);
+
/** This method shows the CertificateChooser dialog with all
certificates, private and
other people's. Useful when choosing certificate/key for encryption
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index b3db07931fbc..6cfed0679a4a 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1410,23 +1410,6 @@ SignatureState SfxObjectShell::ImplGetSignatureState(
bool bScriptingContent )
bool SfxObjectShell::PrepareForSigning(weld::Window* pDialogParent)
{
-// Check if it is stored in OASIS format...
-if ( GetMedium()
-&& GetMedium()->GetFilter()
-&& !GetMedium()->GetName().isEmpty()
-&& ( (!GetMedium()->GetFilter()->IsOwnFormat() &&
!GetMedium()->GetFilter()->GetSupportsSigning())
-|| (GetMedium()->GetFilter()->IsOwnFormat() &&
!GetMedium()->HasStorage_Impl())
-)
-)
-{
-// Only OASIS and OOo6.x formats will be handled further
-std::unique_ptr
xBox(Application::CreateMessageDialog(pDialogParent,
- VclMessageType::Info,
VclButt
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/svx include/vcl sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/source vcl/unx
cui/source/customize/cfg.cxx |4
cui/source/dialogs/multipat.cxx|4
cui/source/dialogs/pastedlg.cxx|2
cui/uiconfig/ui/charnamepage.ui| 85 ++-
include/svx/langbox.hxx|1
include/vcl/weld.hxx | 23 +--
sc/source/ui/miscdlgs/mvtabdlg.cxx |2
sd/source/ui/dlg/PhotoAlbumDialog.cxx |8 -
sd/source/ui/dlg/custsdlg.cxx |2
sfx2/source/dialog/mgetempl.cxx|2
svtools/source/control/ctrlbox.cxx |4
svx/source/dialog/langbox.cxx | 17 ++
sw/source/ui/frmdlg/column.cxx |2
sw/source/uibase/misc/numberingtypelistbox.cxx |4
sw/source/uibase/utlui/uitool.cxx |2
vcl/source/app/salvtables.cxx | 70 +
vcl/unx/generic/print/prtsetup.cxx |8 -
vcl/unx/gtk3/gtk3gtkinst.cxx | 191 +++--
18 files changed, 298 insertions(+), 133 deletions(-)
New commits:
commit 2419fa71d8b2223a50f596d5db7721f6213d4f87
Author: Caolán McNamara
AuthorDate: Fri Sep 14 14:43:07 2018 +0100
Commit: Caolán McNamara
CommitDate: Mon Sep 17 10:02:23 2018 +0200
add image support to weld::ComboBoxText
Change-Id: Ie7f00ed4aef5318a525a526d0377bb7952bdd5a0
Reviewed-on: https://gerrit.libreoffice.org/60499
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index d9d2f8dc9468..facdf5e59e3c 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1967,7 +1967,7 @@ IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl,
weld::Entry&, void)
const int nNewMenuPos = m_xMenuListBox->find_id(m_sNewMenuEntryId);
const int nOldSelection = m_xMenuListBox->get_selected_index();
m_xMenuListBox->remove(nNewMenuPos);
-m_xMenuListBox->insert(nNewMenuPos, m_sNewMenuEntryId,
pNewEntryData->GetName(), "");
+m_xMenuListBox->insert(nNewMenuPos, m_sNewMenuEntryId,
pNewEntryData->GetName(), nullptr);
m_xMenuListBox->select(nOldSelection);
}
@@ -2005,7 +2005,7 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl,
weld::Button&, rButton, void )
OUString sId = m_xMenuListBox->get_id(nSourceEntry);
OUString sEntry = m_xMenuListBox->get_text(nSourceEntry);
m_xMenuListBox->remove(nSourceEntry);
-m_xMenuListBox->insert(nTargetEntry, sId, sEntry, "");
+m_xMenuListBox->insert(nTargetEntry, sId, sEntry, nullptr);
m_xMenuListBox->select(nTargetEntry);
UpdateButtonStates();
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index a5f0734b85f2..a006d606ed6b 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -125,7 +125,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl,
weld::Button&, void)
}
else
{
-m_xPathLB->append(aURL, sInsPath, "");
+m_xPathLB->append(aURL, sInsPath);
}
SelectHdl_Impl(*m_xPathLB);
@@ -328,7 +328,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath)
bool bIsSystemPath =
osl::FileBase::getSystemPathFromFileURL(sPath, sSystemPath) ==
osl::FileBase::E_None;
-m_xPathLB->append(sPath, bIsSystemPath ? sSystemPath : sPath, "");
+m_xPathLB->append(sPath, bIsSystemPath ? sSystemPath : sPath);
}
while (nIndex >= 0);
}
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index d48235c5a3ac..7b70ed34fa0a 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -154,7 +154,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const
TransferableDataHelpe
if (ObjectLB().find_text(aName) == -1)
{
-
ObjectLB().append(OUString::number(static_cast(nFormat)), aName,
"");
+
ObjectLB().append(OUString::number(static_cast(nFormat)), aName);
}
}
}
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index fa44eab6f724..55ac94e0f44a 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -50,6 +50,46 @@
False
False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
True
False
@@ -370,12 +410,21 @@
-
+
True
False
start
True
+liststore4
Re: API-CHANGE - dropping string properties which use vnd.sun.star.GraphicObject URL
Hi, On Fri, Sep 14, 2018 at 12:50:16PM -0700, Pusteblumi wrote: > Will this backport soon be available in a release? > Today, I tested with 6.1.1.2 (x64) and 6.2.0.0.alpha0+ (x64). The problem > persists in both versions. It's in master and on its way to 6.1.2. Care to open a bugreport if it still doesn't work on master? > Miklos Vajna-4 wrote > >> sNewURL = oBitmaps.getByName( "OOoLilyPond" ) > > The bitmap table gives you objects implementing the XBitmap interface, > > not strings. > > If there is something I should change in my code, I'd be thankful for any > help. ;-) The point is that getByName() of that bitmap table now gives you a Graphic, not just a URL, which is a string reference to a memory address, which may or may not be there by the time you would turn that string reference back to a pointer. This means the ideal code is the same as yours, but the sNewURL name is a bit misleading as it's no longer an URL. Also later you should set the "Graphic", not "GraphicURL" property when you use the Graphic. But as said before, your code should work as-is unchanged for compatibility reasons; if it doesn't, it's a bug to be fixed. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - chart2/source sc/source
chart2/source/controller/main/ChartController_Window.cxx | 18 +--
chart2/source/tools/DiagramHelper.cxx|7 ++---
sc/source/core/data/dptabres.cxx |5 ++--
sc/source/core/tool/compiler.cxx |4 +--
sc/source/core/tool/scmatrix.cxx |3 --
sc/source/filter/excel/excform.cxx |3 --
sc/source/filter/xml/xmlexprt.cxx|4 +--
sc/source/ui/docshell/impex.cxx |5 ++--
sc/source/ui/vba/vbarange.cxx|5 +---
sc/source/ui/vba/vbaworksheet.cxx|9 ---
sc/source/ui/vba/vbaworksheets.cxx |5
sc/source/ui/view/drawview.cxx |3 --
sc/source/ui/view/gridwin2.cxx |3 --
sc/source/ui/view/tabview.cxx|8 +++---
14 files changed, 30 insertions(+), 52 deletions(-)
New commits:
commit 35109fe7c058cf6d961245fc24550d1c1d39a300
Author: Jochen Nitschke
AuthorDate: Sun Sep 16 18:05:29 2018 +0200
Commit: Noel Grandin
CommitDate: Mon Sep 17 09:25:23 2018 +0200
cppcheck: knownConditionTrueFalse in chart2
Change-Id: I89164a9bc4710d9a90d415c2369c2cde3857c778
Reviewed-on: https://gerrit.libreoffice.org/60552
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 5e307d7a409b..e7f656337507 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1435,12 +1435,9 @@ bool ChartController::execute_KeyInput( const KeyEvent&
rKEvt )
if( bAlternate && pChartWindow )
{
// together with Alt-key: 1 px in each direction
-if( pChartWindow )
-{
-Size aPixelSize = pChartWindow->PixelToLogic(
Size( 2, 2 ));
-fGrowAmountX = static_cast< double >(
aPixelSize.Width());
-fGrowAmountY = static_cast< double >(
aPixelSize.Height());
-}
+Size aPixelSize = pChartWindow->PixelToLogic( Size( 2,
2 ));
+fGrowAmountX = static_cast< double >(
aPixelSize.Width());
+fGrowAmountY = static_cast< double >(
aPixelSize.Height());
}
if( nCode == KEY_SUBTRACT )
{
@@ -1465,12 +1462,9 @@ bool ChartController::execute_KeyInput( const KeyEvent&
rKEvt )
if( bAlternate && pChartWindow )
{
// together with Alt-key: 1 px
-if(pChartWindow)
-{
-Size aPixelSize = pChartWindow->PixelToLogic(
Size( 1, 1 ));
-fShiftAmountX = static_cast< double >(
aPixelSize.Width());
-fShiftAmountY = static_cast< double >(
aPixelSize.Height());
-}
+Size aPixelSize = pChartWindow->PixelToLogic( Size( 1,
1 ));
+fShiftAmountX = static_cast< double >(
aPixelSize.Width());
+fShiftAmountY = static_cast< double >(
aPixelSize.Height());
}
switch( nCode )
{
diff --git a/chart2/source/tools/DiagramHelper.cxx
b/chart2/source/tools/DiagramHelper.cxx
index faaf3c1a4fdd..a3059ecc5c4a 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1392,11 +1392,10 @@ bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
if( xOtherDataSeriesContainer.is()
)
{
uno::Sequence< uno::Reference<
XDataSeries > > aOtherSeriesList( xOtherDataSeriesContainer->getDataSeries() );
-sal_Int32 nOtherSeriesIndex =
0;
-if( nOtherSeriesIndex >= 0 &&
nOtherSeriesIndex < aOtherSeriesList.getLength() )
+if( 0 <
aOtherSeriesList.getLength() )
{
-uno::Reference<
XDataSeries > xExchangeSeries( aOtherSeriesList[nOtherSeriesIndex] );
-
aOtherSeriesList[nOtherSeriesIndex] = xGivenDataSeries;
+uno::Reference<
XDataSeries > xExchangeSeries( aOtherSeriesList[0] );
+
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/calendar/calendar_jewish.cxx | 16 +-
i18npool/source/collator/gencoll_rule.cxx |2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |2
i18npool/source/localedata/LocaleNode.cxx | 69
--
i18npool/source/localedata/saxparser.cxx |2
i18npool/source/nativenumber/nativenumbersupplier.cxx | 14 +-
i18npool/source/registerservices/registerservices.cxx |4
i18npool/source/search/textsearch.cxx |4
i18npool/source/textconversion/genconv_dict.cxx |8 -
i18npool/source/textconversion/textconversion_ko.cxx |2
i18npool/source/textconversion/textconversion_zh.cxx |2
i18npool/source/transliteration/ignoreKashida_CTL.cxx |2
i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx |2
i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx |2
i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx |2
i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx |2
i18npool/source/transliteration/transliterationImpl.cxx |4
17 files changed, 36 insertions(+), 103 deletions(-)
New commits:
commit a85d3ba1c0de313b60324b9ecfa488bb99d69d06
Author: Stephan Bergmann
AuthorDate: Sat Sep 15 19:10:54 2018 +0200
Commit: Stephan Bergmann
CommitDate: Mon Sep 17 09:05:16 2018 +0200
loplugin:external in i18npool
...showing that print_node etc. are actually unused
Change-Id: Ife7faf53dc2487a7ee0cfbe131a761ea18104945
Reviewed-on: https://gerrit.libreoffice.org/60538
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/i18npool/source/calendar/calendar_jewish.cxx
b/i18npool/source/calendar/calendar_jewish.cxx
index 1a36ffa5ffad..837f6f14f35a 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -51,18 +51,18 @@ Calendar_jewish::Calendar_jewish()
const int HebrewEpoch = -1373429; // Absolute date of start of Hebrew calendar
// True if year is an Hebrew leap year
-bool HebrewLeapYear(sal_Int32 year) {
+static bool HebrewLeapYear(sal_Int32 year) {
return 7 * year) + 1) % 19) < 7);
}
// Last month of Hebrew year.
-sal_Int32 LastMonthOfHebrewYear(sal_Int32 year) {
+static sal_Int32 LastMonthOfHebrewYear(sal_Int32 year) {
return (HebrewLeapYear(year)) ? 13 : 12;
}
// Number of days elapsed from the Sunday prior to the start of the
// Hebrew calendar to the mean conjunction of Tishri of Hebrew year.
-sal_Int32 HebrewCalendarElapsedDays(sal_Int32 year) {
+static sal_Int32 HebrewCalendarElapsedDays(sal_Int32 year) {
sal_Int32 MonthsElapsed =
(235 * ((year - 1) / 19)) // Months in complete cycles so
far.
+ (12 * ((year - 1) % 19)) // Regular months in this cycle.
@@ -97,23 +97,23 @@ sal_Int32 HebrewCalendarElapsedDays(sal_Int32 year) {
}
// Number of days in Hebrew year.
-sal_Int32 DaysInHebrewYear(sal_Int32 year) {
+static sal_Int32 DaysInHebrewYear(sal_Int32 year) {
return ((HebrewCalendarElapsedDays(year + 1)) -
(HebrewCalendarElapsedDays(year)));
}
// True if Heshvan is long in Hebrew year.
-bool LongHeshvan(sal_Int32 year) {
+static bool LongHeshvan(sal_Int32 year) {
return ((DaysInHebrewYear(year) % 10) == 5);
}
// True if Kislev is short in Hebrew year.
-bool ShortKislev(sal_Int32 year) {
+static bool ShortKislev(sal_Int32 year) {
return ((DaysInHebrewYear(year) % 10) == 3);
}
// Last day of month in Hebrew year.
-sal_Int32 LastDayOfHebrewMonth(sal_Int32 month, sal_Int32 year) {
+static sal_Int32 LastDayOfHebrewMonth(sal_Int32 month, sal_Int32 year) {
if ((month == 2)
|| (month == 4)
|| (month == 6)
@@ -188,7 +188,7 @@ public:
// Gregorian dates
-int LastDayOfGregorianMonth(int month, int year) {
+static int LastDayOfGregorianMonth(int month, int year) {
// Compute the last date of the month for the Gregorian calendar.
switch (month) {
diff --git a/i18npool/source/collator/gencoll_rule.cxx
b/i18npool/source/collator/gencoll_rule.cxx
index 3048d12bb90b..88b8b50ea423 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -33,7 +33,7 @@
/* Main Procedure */
-void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
+static void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
{
FILE *fp = fopen(file, "wb");
if (fp == nullptr) {
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index b36195569c18..899ea58457d3 100644
--- a/i18npool/source/defaultnumber
