[Libreoffice-commits] online.git: Branch 'private/pranavk/comments' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/pdfiadaptor.cxx|4 ---
sdext/source/pdfimport/tree/pdfiprocessor.cxx |8 --
sdext/source/pdfimport/tree/pdfiprocessor.hxx |8 --
sdext/source/presenter/PresenterPaneContainer.cxx | 12 +
sdext/source/presenter/PresenterPaneContainer.hxx | 10
sdext/source/presenter/PresenterScreen.cxx| 21 ++---
sdext/source/presenter/PresenterScreen.hxx|7 -
sdext/source/presenter/PresenterSlideSorter.cxx |5
sdext/source/presenter/PresenterSlideSorter.hxx |1
sdext/source/presenter/PresenterToolBar.cxx |6
sdext/source/presenter/PresenterToolBar.hxx |1
sdext/source/presenter/PresenterWindowManager.cxx | 27 --
12 files changed, 9 insertions(+), 101 deletions(-)
New commits:
commit 66efe63e2a2a80e46d2ee4a340a1f4d4c1bf66c3
Author: Noel Grandin
Date: Wed Jun 21 14:02:28 2017 +0200
loplugin:unusedfields in sdext
Change-Id: Ib4ce46f370298a0ae86fa95141abb253c2bbfff8
Reviewed-on: https://gerrit.libreoffice.org/39058
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx
b/sdext/source/pdfimport/pdfiadaptor.cxx
index b4fd1e83ab60..1bbbdf4660c1 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -242,10 +242,6 @@ bool PDFIRawAdaptor::parse( const
uno::Reference& xInput
std::shared_ptr pSink(
new PDFIProcessor(xStatus, m_xContext));
-// TEMP! TEMP!
-if( m_bEnableToplevelText )
-pSink->enableToplevelText();
-
bool bSuccess=false;
if( xInput.is() )
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 7463089277a1..29b8a56b6a0b 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -70,8 +70,7 @@ namespace pdfi
m_aImages(),
m_nPages(0),
m_nNextZOrder( 1 ),
-m_xStatusIndicator( xStat ),
-m_bHaveTextOnDocLevel(false)
+m_xStatusIndicator( xStat )
{
FontAttributes aDefFont;
aDefFont.familyName = "Helvetica";
@@ -87,11 +86,6 @@ namespace pdfi
m_aGCToId[ aDefGC ] = 0;
}
-void PDFIProcessor::enableToplevelText()
-{
-m_bHaveTextOnDocLevel = true;
-}
-
void PDFIProcessor::setPageNum( sal_Int32 nPages )
{
m_nPages = nPages;
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 1588b057d9c3..81facadfd9fd 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -73,9 +73,6 @@ namespace pdfi
explicit PDFIProcessor( const css::uno::Reference<
css::task::XStatusIndicator >& xStat,
css::uno::Reference< css::uno::XComponentContext > const &
xContext) ;
-/// TEMP - enable writer-like text:p on doc level
-void enableToplevelText();
-
void emit( XmlEmitter& rEmitter,
const TreeVisitorFactory& rVisitorFactory );
@@ -193,11 +190,8 @@ namespace pdfi
sal_Int32 m_nPages;
sal_Int32 m_nNextZOrder;
-css::uno::Reference<
-css::task::XStatusIndicator >
+css::uno::Reference< css::task::XStatusIndicator >
m_xStatusIndicator;
-
-bool m_bHaveTextOnDocLevel;
};
class CharGlyph final
{
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx
b/sdext/source/presenter/PresenterPaneContainer.cxx
index 66eef2cef50f..91a520d688ca 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -57,11 +57,7 @@ void PresenterPaneContainer::PreparePane (
const OUString& rsTitle,
const OUString& rsAccessibleTitle,
const bool bIsOpaque,
-const ViewInitializationFunction& rViewInitialization,
-const double nLeft,
-const double nTop,
-const double nRight,
-const double nBottom)
+const ViewInitializationFunction& rViewInitialization)
{
if ( ! rxPaneId.is())
return;
@@ -86,10 +82,6 @@ void PresenterPaneContainer::PreparePane (
}
pDescriptor->msAccessibleTitleTemplate = rsAccessibleTitle;
pDescriptor->maViewInitialization = rViewInitialization;
-pDescriptor->mnLeft = nLeft;
-pDescriptor->mnTop = nTop;
-pDescriptor->mnRight = nRight;
-pDescriptor->mnBottom = nBottom;
pDescriptor->mbIsActive = true;
pDescriptor->mbIsOpaque = bIsOpaque;
pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
@@ -124,7 +116,7 @@ PresenterPaneContainer::SharedPaneDescriptor
pDescriptor = FindPaneURL(sPaneURL);
if (pDescriptor.get() == nullptr)
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sdxfer.cxx|3 ---
sd/source/ui/dlg/prltempl.cxx | 16
sd/source/ui/dlg/tabtempl.cxx | 15 +--
sd/source/ui/func/fuoaprms.cxx |1 -
sd/source/ui/inc/SlideSorter.hxx |4
sd/source/ui/inc/ViewShellImplementation.hxx |1 -
sd/source/ui/inc/prltempl.hxx |8
sd/source/ui/inc/sdxfer.hxx|1 -
sd/source/ui/inc/tabtempl.hxx |5 -
sd/source/ui/inc/unoaprms.hxx |6 --
sd/source/ui/inc/unosrch.hxx |4 +---
sd/source/ui/slidesorter/shell/SlideSorter.cxx |4
sd/source/ui/unoidl/unosrch.cxx|8 +++-
sd/source/ui/view/ViewShellImplementation.cxx |3 +--
sd/source/ui/view/sdview2.cxx |1 -
sd/source/ui/view/viewshel.cxx |2 --
16 files changed, 18 insertions(+), 64 deletions(-)
New commits:
commit 450bf26c23bf2bb4346236778ef066c6e215eafe
Author: Noel Grandin
Date: Wed Jun 21 14:21:11 2017 +0200
loplugin:unusedfields in sd part2
Change-Id: I14b34e08d7bb000bce1625bd0d16050b1269f3e8
Reviewed-on: https://gerrit.libreoffice.org/39060
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index a1409fac1854..f2151019e8d5 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -94,7 +94,6 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc,
::sd::View* pWorkView,
, mbLateInit( bInitOnGetData )
, mbPageTransferable( false )
, mbPageTransferablePersistent( false )
-, mbIsUnoObj( false )
, maUserData()
{
if( mpSourceDoc )
@@ -249,8 +248,6 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
if( pInfo )
mpImageMap = new ImageMap( pInfo->GetImageMap() );
-
-mbIsUnoObj = pObj && pObj->IsUnoObj();
}
}
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index dbd14ef2161d..e88ad3551298 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -176,15 +176,15 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg(
SfxObjectShell* pDocSh,
mnTransparency = AddTabPage( "RID_SVXPAGE_TRANSPARENCE",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TRANSPARENCE ), nullptr );
mnFont = AddTabPage( "RID_SVXPAGE_CHAR_NAME",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), nullptr );
mnEffects = AddTabPage( "RID_SVXPAGE_CHAR_EFFECTS",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), nullptr );
-mnParagr = AddTabPage( "RID_SVXPAGE_STD_PARAGRAPH",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_STD_PARAGRAPH ), nullptr );
+AddTabPage( "RID_SVXPAGE_STD_PARAGRAPH", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_STD_PARAGRAPH ), nullptr );
mnTextAtt = AddTabPage( "RID_SVXPAGE_TEXTATTR",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TEXTATTR ), nullptr );
-mnBullet = AddTabPage( "RID_SVXPAGE_PICK_BULLET",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BULLET ), nullptr );
-mnNum = AddTabPage( "RID_SVXPAGE_PICK_SINGLE_NUM",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_SINGLE_NUM ), nullptr );
-mnBitmap = AddTabPage( "RID_SVXPAGE_PICK_BMP",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PICK_BMP ), nullptr );
-mnOptions = AddTabPage( "RID_SVXPAGE_NUM_OPTIONS",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUM_OPTIONS ), nullptr );
-mnTab = AddTabPage( "RID_SVXPAGE_TABULATOR",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_TABULATOR ), nullptr );
-mnAsian = AddTabPage( "RID_SVXPAGE_PARA_ASIAN",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PARA_ASIAN ), nullptr );
-mnAlign = AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr );
+AddTabPage( "RID_SVXPAGE_PICK_BULLET", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_PICK_BULLET ), nullptr );
+AddTabPage( "RID_SVXPAGE_PICK_SINGLE_NUM", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_PICK_SINGLE_NUM ), nullptr );
+AddTabPage( "RID_SVXPAGE_PICK_BMP", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_PICK_BMP ), nullptr );
+AddTabPage( "RID_SVXPAGE_NUM_OPTIONS", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_NUM_OPTIONS ), nullptr );
+AddTabPage( "RID_SVXPAGE_TABULATOR", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_TABULATOR ), nullptr );
+AddTabPage( "RID_SVXPAGE_PARA_ASIAN", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_PARA_ASIAN ), nullptr );
+AddTabPage( "RID_SVXPAGE_ALIGN_PARAGRAPH", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_ALIGN_PARAGRAPH ), nullptr );
mnBackground = AddTabPage( "RID_SVXPAGE_BACKGROUND",
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), nullptr);
SvtCJKOptions aCJKOptions;
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 17e962bc8b36..4c3
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/CustomAnimationPreset.hxx |1
sd/inc/Outliner.hxx | 11 -
sd/inc/drawdoc.hxx |1
sd/source/core/CustomAnimationPreset.cxx |1
sd/source/core/drawdoc.cxx |5
sd/source/filter/eppt/eppt.cxx |4 ---
sd/source/filter/eppt/eppt.hxx |1
sd/source/filter/eppt/epptso.cxx |5
sd/source/ui/dlg/dlgchar.cxx |2 -
sd/source/ui/docshell/docshel4.cxx |6 -
sd/source/ui/docshell/docshell.cxx |9 ++-
sd/source/ui/docshell/sdclient.cxx |3 --
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 11 -
sd/source/ui/framework/factories/BasicToolBarFactory.hxx |1
sd/source/ui/func/fudraw.cxx | 11 -
sd/source/ui/func/fupoor.cxx | 17 ---
sd/source/ui/inc/Client.hxx |2 -
sd/source/ui/inc/DrawDocShell.hxx|1
sd/source/ui/inc/FrameView.hxx |3 --
sd/source/ui/inc/dlg_char.hxx|1
sd/source/ui/inc/fupoor.hxx |1
sd/source/ui/slideshow/slideshow.cxx |1
sd/source/ui/view/Outliner.cxx |6 -
sd/source/ui/view/drviews1.cxx |5
sd/source/ui/view/frmview.cxx|1
25 files changed, 8 insertions(+), 102 deletions(-)
New commits:
commit 60f3e9b67e688e6f7f304cc7fb14fc28af83f351
Author: Noel Grandin
Date: Wed Jun 21 14:42:23 2017 +0200
loplugin:unusedfields in sd part3
Change-Id: Id8277e4b3dc9776715a7bd85e1a4f6610aad9b19
Reviewed-on: https://gerrit.libreoffice.org/39061
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index e9f46362a58b..530a6e7a990c 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -61,7 +61,6 @@ public:
private:
OUString maPresetId;
OUString maProperty;
-sal_Int16 mnPresetClass;
OUString maLabel;
OUString maDefaultSubTyp;
double mfDuration;
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 874bc3952668..917639125d0f 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -320,17 +320,6 @@ private:
*/
::sd::outliner::IteratorPosition maLastValidPosition;
-/** This flag indicates whether a selection change event is expected due
-to a programatical change of the selection.
-*/
-bool mbExpectingSelectionChangeEvent;
-
-/** This flag is set to true when the whole document has been
-processed once 'officially', i.e. a message box has been shown
-that tells the user so.
-*/
-bool mbWholeDocumentProcessed;
-
/** When this flag is true then a PrepareSpelling() is executed when
StartSearchAndReplace() is called the next time.
*/
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index a22259f58db4..2a72855698fd 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -173,7 +173,6 @@ private:
boolmbAllocDocSh; // => AllocModel()
DocumentTypemeDocType;
CharClass* mpCharClass;
-css::lang::Locale* mpLocale;
::std::unique_ptr mpDrawPageListWatcher;
::std::unique_ptr mpMasterPageListWatcher;
diff --git a/sd/source/core/CustomAnimationPreset.cxx
b/sd/source/core/CustomAnimationPreset.cxx
index 7291f88c619b..35bb383dfbe6 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -127,7 +127,6 @@ CustomAnimationPreset::CustomAnimationPreset( const
CustomAnimationEffectPtr& pE
{
maPresetId = pEffect->getPresetId();
maProperty = pEffect->getProperty();
-mnPresetClass = pEffect->getPresetClass();
add( pEffect );
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index fba824d42a94..727b7d0b29af 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -172,7 +172,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
, mbAllocDocSh(false)
, meDocType(eType)
, mpCharClass(nullptr)
-, mpLocale(nullptr)
, mbUseEmbedFonts(false)
{
mpDrawPageListWatcher.reset(new ImpDrawPageListWatcher(*this));
@@ -236,7 +235,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
LanguageType eRealLanguage = MsLangId::getRealLanguage( meLanguage );
LanguageTag aLanguageTag( eRealLanguage);
-mpLocale = new css::lang::Locale( aLanguageTag.getLocale());
mpCharClass
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/WindowUpdater.hxx|9
-
sd/source/ui/slidesorter/controller/SlideSorterController.cxx |7
+--
sd/source/ui/slidesorter/controller/SlsProperties.cxx |6 +-
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 10
--
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx |5 -
sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx |1 -
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx |8
sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx |2 --
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx|1 -
sd/source/ui/slidesorter/model/SlsVisualState.cxx |2 --
sd/source/ui/slidesorter/view/SlsTheme.cxx|2 --
sd/source/ui/view/WindowUpdater.cxx |8
+---
sd/source/ui/view/viewshel.cxx|1 -
13 files changed, 3 insertions(+), 59 deletions(-)
New commits:
commit d740173b9cc0d05206349826f55d2b3444204056
Author: Noel Grandin
Date: Wed Jun 21 14:11:06 2017 +0200
loplugin:unusedfields in sd part1
Change-Id: I8e25d68eecbc3a96d734d9c10b125aed5d01cbc5
Reviewed-on: https://gerrit.libreoffice.org/39059
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/inc/WindowUpdater.hxx
b/sd/source/ui/inc/WindowUpdater.hxx
index ee5dcd0f55f8..33c947d8eb07 100644
--- a/sd/source/ui/inc/WindowUpdater.hxx
+++ b/sd/source/ui/inc/WindowUpdater.hxx
@@ -73,12 +73,6 @@ public:
*/
void UnregisterWindow (vcl::Window* pWindow);
-/** Set the view shell whose output devices shall be kept up to date.
-It is used to clear the master page cache so that a redraw affects
-the master page content as well.
-*/
-void SetViewShell (ViewShell& rViewShell);
-
/** Set the document so that it is reformatted when one of the monitored
values changes.
@param pDocument
@@ -104,9 +98,6 @@ private:
/// Options to monitor for changes.
SvtCTLOptions maCTLOptions;
-/// Keep the output devices of this view shell up to date.
-ViewShell* mpViewShell;
-
/// The document rendered in the output devices.
SdDrawDocument* mpDocument;
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index bb08715be29b..c900cdf6e55d 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -111,14 +111,12 @@ SlideSorterController::SlideSorterController
(SlideSorter& rSlideSorter)
mpListener(),
mnModelChangeLockCount(0),
mbIsForcedRearrangePending(false),
- mbPreModelChangeDone(false),
mbPostModelChangePending(false),
maSelectionBeforeSwitch(),
mnCurrentPageBeforeSwitch(0),
mpEditModeChangeMasterPage(nullptr),
maTotalWindowArea(),
- mnPaintEntranceCount(0),
- mbIsContextMenuOpen(false)
+ mnPaintEntranceCount(0)
{
sd::Window *pWindow (mrSlideSorter.GetContentWindow().get());
OSL_ASSERT(pWindow);
@@ -380,7 +378,6 @@ bool SlideSorterController::Command (
}
}
-mbIsContextMenuOpen = true;
if (pViewShell != nullptr)
{
SfxDispatcher* pDispatcher = pViewShell->GetDispatcher();
@@ -393,7 +390,6 @@ bool SlideSorterController::Command (
pFunction->ResetMouseAnchor();
}
}
-mbIsContextMenuOpen = false;
if (pPage == nullptr)
{
// Remember the position of the insertion indicator before
@@ -464,7 +460,6 @@ void SlideSorterController::PreModelChange()
// Prevent PreModelChange to execute more than once per model lock.
if (mbPostModelChangePending)
return;
-mbPreModelChangeDone = true;
if (mrSlideSorter.GetViewShell() != nullptr)
mrSlideSorter.GetViewShell()->Broadcast(
diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
index 284f50ac8547..94c3de902cb9 100644
--- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx
@@ -34,9 +34,7 @@ Properties::Properties()
maTextColor(Application::GetSettings().GetStyleSettings().GetActiveTextColor()),
maSelectionColor(Application::GetSettings().GetStyleSettings().GetHighlightColor()),
maHighlightColor(Application::GetSettings().GetStyleSettings().GetMenuHighlightColor()),
- mbIsUIReadOnly(false),
- mbIsHighContrastModeActive(
- Application::GetSettings().GetStyleSettings().GetHighContrastMode())
+ mbIsUIReadOnly(false)
[Libreoffice-commits] core.git: 2 commits - include/vcl sw/source
include/vcl/errcode.hxx |2 +-
sw/source/core/access/accportions.cxx | 10 +-
sw/source/core/access/accportions.hxx |1 -
sw/source/core/doc/DocumentStateManager.cxx |2 --
sw/source/core/doc/swserv.cxx |2 --
sw/source/core/docnode/node.cxx |4
sw/source/core/edit/edlingu.cxx |5 +
sw/source/core/frmedt/tblsel.cxx|4
sw/source/core/inc/DocumentStateManager.hxx |1 -
sw/source/core/inc/drawfont.hxx | 20
sw/source/core/inc/frame.hxx|3 ---
sw/source/core/inc/mvsave.hxx |1 -
sw/source/core/layout/wsfrm.cxx |1 -
sw/source/core/text/frmform.cxx |2 --
sw/source/core/text/frmpaint.cxx|4
sw/source/core/text/inftxt.cxx |7 ---
sw/source/core/text/inftxt.hxx |3 ---
sw/source/core/text/itrform2.cxx|1 -
sw/source/core/text/itrform2.hxx|3 ---
sw/source/core/text/porhyph.hxx |1 -
sw/source/core/text/txthyph.cxx |4 +---
21 files changed, 4 insertions(+), 77 deletions(-)
New commits:
commit e3b61a4bc8771fb7ef2b21ac7c82892592d94ede
Author: Noel Grandin
Date: Wed Jun 21 11:56:49 2017 +0200
loplugin:unusedfields in sw part4
Change-Id: I1ffd51ab74b2ca809153f07f8de85e9c490749fd
Reviewed-on: https://gerrit.libreoffice.org/39042
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/access/accportions.cxx
b/sw/source/core/access/accportions.cxx
index 43d9f428cb37..d66dbfb2216d 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -80,8 +80,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
m_aPortionAttrs(),
m_pSentences( nullptr ),
m_nBeforePortions( 0 ),
-m_bFinished( false ),
-m_bLastIsSpecial( false )
+m_bFinished( false )
{
OSL_ENSURE( m_pTextNode != nullptr, "Text node is needed!" );
@@ -120,8 +119,6 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength,
sal_uInt16 nType, sal_Int3
// update buffer + nModelPosition
m_aBuffer.append( m_pTextNode->GetText().copy(m_nModelPosition, nLength) );
m_nModelPosition += nLength;
-
-m_bLastIsSpecial = false;
}
void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType )
@@ -210,11 +207,6 @@ void SwAccessiblePortionData::Special(
// update buffer + nModelPosition
m_aBuffer.append( sDisplay );
m_nModelPosition += nLength;
-
-// remember 'last' special portion (unless it's our own 'closing'
-// portions from 'Finish()'
-if( nType != POR_TERMINATE )
-m_bLastIsSpecial = true;
}
void SwAccessiblePortionData::LineBreak(sal_Int32 /*nWidth*/)
diff --git a/sw/source/core/access/accportions.hxx
b/sw/source/core/access/accportions.hxx
index 93ffeba0d942..69d0259f760e 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -68,7 +68,6 @@ class SwAccessiblePortionData : public SwPortionHandler
size_t m_nBeforePortions; /// # of portions before first model
character
bool m_bFinished;
-bool m_bLastIsSpecial;/// set if last portion was 'Special()'
/// returns the index of the first position whose value is smaller
/// or equal, and whose following value is equal or larger
diff --git a/sw/source/core/doc/DocumentStateManager.cxx
b/sw/source/core/doc/DocumentStateManager.cxx
index 04a865a3f70b..dd78cf58f3b9 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -31,7 +31,6 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc )
:
m_rDoc( i_rSwdoc ),
mbEnableSetModified(true),
mbModified(false),
-mbLoaded(false),
mbUpdateExpField(false),
mbNewDoc(false),
mbInCallModified(false)
@@ -116,7 +115,6 @@ void DocumentStateManager::SetUpdateExpFieldStat(bool b)
void DocumentStateManager::SetLoaded()
{
-mbLoaded = true;
}
}
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index f18d00453a65..8d00223b680f 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -285,14 +285,12 @@ void SwServerObject::SetDdeBookmark( ::sw::mark::IMark&
rBookmark)
SwDataChanged::SwDataChanged( const SwPaM& rPam )
: pPam( &rPam ), pPos( nullptr ), pDoc( rPam.GetDoc() )
{
-nNode = rPam.GetPoint()->nNode.GetIndex();
nContent = rPam.GetPoint()->nContent.GetIndex();
}
SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos )
: pPam( nullptr ), pPos( &rPos ), pDoc( pDc )
{
-nNode = rPos.nNode.GetIndex();
nContent = rPos.nContent.GetIndex();
}
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 4866fb5cdaad..33f3ccd908c1 100644
--- a/sw/sourc
[Libreoffice-commits] core.git: sd/Library_sd.mk sd/source
sd/Library_sd.mk |1 - sd/source/core/sdattr.cxx | 20 2 files changed, 21 deletions(-) New commits: commit d3c70b5f704f20e15611a8bf0d162a3c637400b6 Author: Takeshi Abe Date: Wed Jun 21 20:59:55 2017 +0900 sd: Kill empty sdattr.cxx Change-Id: I9343616352489205d606043fb773185f3784a8d9 Reviewed-on: https://gerrit.libreoffice.org/39051 Tested-by: Jenkins Reviewed-by: Takeshi Abe diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 62a4c3775e47..683da42a92e6 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -134,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/core/drawdoc4 \ sd/source/core/drawdoc_animations \ sd/source/core/pglink \ - sd/source/core/sdattr \ sd/source/core/sdiocmpt \ sd/source/core/sdobjfac \ sd/source/core/sdpage \ diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx deleted file mode 100644 index 52597c57ca92.. --- a/sd/source/core/sdattr.cxx +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source officecfg/registry
desktop/source/app/app.cxx | 44 +
desktop/source/app/updater.cxx |5 +
officecfg/registry/schema/org/openoffice/Office/Update.xcs | 19 +
3 files changed, 68 insertions(+)
New commits:
commit b3b2a752b71070fb58619d0a12d1f2b1017a26ef
Author: Markus Mohrhard
Date: Wed Jun 21 20:18:34 2017 +0200
updater: handle the SeeAlso property after the update succeeded
Change-Id: Ib90f1f7def6de05144bf8215a97a6d6e15207b88
Reviewed-on: https://gerrit.libreoffice.org/39073
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1a765eaa884f..0e7f37fe0c48 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -75,6 +75,8 @@
#include
#include
#include
+#include
+#include
#include
#include
@@ -1465,6 +1467,41 @@ int Desktop::Main()
#if HAVE_FEATURE_UPDATE_MAR
if (officecfg::Office::Update::Update::Enabled::get())
{
+// check if we just updated
+bool bUpdateRunning =
officecfg::Office::Update::Update::UpdateRunning::get();
+if (bUpdateRunning)
+{
+OUString aSeeAlso =
officecfg::Office::Update::Update::SeeAlso::get();
+OUString aOldBuildID =
officecfg::Office::Update::Update::OldBuildID::get();
+
+OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("version") ":buildid}");
+rtl::Bootstrap::expandMacros(aBuildID);
+if (aOldBuildID == aBuildID)
+{
+SAL_INFO("desktop", "failed updater");
+}
+else
+{
+if (!aSeeAlso.isEmpty())
+{
+SAL_INFO("desktop", "See also: " << aSeeAlso);
+Reference< css::system::XSystemShellExecute >
xSystemShell(
+
SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
+
+xSystemShell->execute( aSeeAlso, OUString(),
SystemShellExecuteFlags::URIS_ONLY );
+}
+}
+
+// reset all the configuration values,
+// all values need to be read before this code
+std::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Update::Update::UpdateRunning::set(false,
batch);
+officecfg::Office::Update::Update::SeeAlso::set(OUString(),
batch);
+officecfg::Office::Update::Update::OldBuildID::set(OUString(),
batch);
+batch->commit();
+}
+
osl::DirectoryItem aPatchInfo;
osl::DirectoryItem::get(Updater::getUpdateInfoURL(), aPatchInfo);
osl::DirectoryItem aDirectoryItem;
@@ -1472,6 +1509,13 @@ int Desktop::Main()
if (aPatchInfo.is() && aDirectoryItem.is())
{
+OUString aBuildID("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("version") ":buildid}");
+rtl::Bootstrap::expandMacros(aBuildID);
+std::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Update::Update::OldBuildID::set(aBuildID,
batch);
+officecfg::Office::Update::Update::UpdateRunning::set(true,
batch);
+batch->commit();
update();
}
else if (isTimeForUpdateCheck())
diff --git a/desktop/source/app/updater.cxx b/desktop/source/app/updater.cxx
index 468c94b4e74c..1d2b7585321c 100644
--- a/desktop/source/app/updater.cxx
+++ b/desktop/source/app/updater.cxx
@@ -694,6 +694,11 @@ void update_checker()
}
}
CreateValidUpdateDir(aUpdateInfo);
+OUString aSeeAlsoURL = aUpdateInfo.aSeeAlsoURL;
+std::shared_ptr< comphelper::ConfigurationChanges > batch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Update::Update::SeeAlso::set(aSeeAlsoURL,
batch);
+batch->commit();
}
}
}
diff --git a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
index 5ad40022e3e5..16f57bc8a986 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Update.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Update.xcs
@@ -47,6 +47,25 @@
daily-master-gandalf
+
+
+Determines if we are currently in an update process.
+Needs to be reset after the update has been applied
+
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/core/tool/token.cxx | 59 ++
1 file changed, 59 insertions(+)
New commits:
commit e074090cea379716096d7025a62ad1c756b4d14f
Author: Eike Rathke
Date: Wed Jun 21 19:42:36 2017 +0200
Resolves: tdf#108671 mark named expression single reference #REF! if deleted
Probably broken already since
commit f77c9d5b3cb65d9c2e2417f60bec1113feac50e1
Date: Mon Jul 29 14:47:07 2013 -0400
Change-Id: If90a959d000a1bf5ab0804deb22d5cfad413ea5e
(cherry picked from commit 6580e171ad054dca38f55822e67a400191cecdf5)
Reviewed-on: https://gerrit.libreoffice.org/39071
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 91100ef32c15..027786958ceb 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3657,6 +3657,65 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
case svSingleRef:
{
ScSingleRefData& rRef = *p->GetSingleRef();
+if (rCxt.mnRowDelta < 0)
+{
+// row(s) deleted.
+
+if (rRef.IsRowRel())
+// Don't modify relative references in names.
+break;
+
+ScAddress aAbs = rRef.toAbs(rPos);
+
+if (aAbs.Col() < rCxt.maRange.aStart.Col() ||
rCxt.maRange.aEnd.Col() < aAbs.Col())
+// column of the reference is not in the
deleted column range.
+break;
+
+if (aAbs.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+const SCROW nDelStartRow =
rCxt.maRange.aStart.Row() + rCxt.mnRowDelta;
+const SCROW nDelEndRow = nDelStartRow -
rCxt.mnRowDelta - 1;
+
+if (nDelStartRow <= aAbs.Row() && aAbs.Row() <=
nDelEndRow)
+{
+// This reference is deleted.
+rRef.SetRowDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsColRel())
+// Don't modify relative references in names.
+break;
+
+ScAddress aAbs = rRef.toAbs(rPos);
+
+if (aAbs.Row() < rCxt.maRange.aStart.Row() ||
rCxt.maRange.aEnd.Row() < aAbs.Row())
+// row of the reference is not in the deleted
row range.
+break;
+
+if (aAbs.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+const SCCOL nDelStartCol =
rCxt.maRange.aStart.Col() + rCxt.mnColDelta;
+const SCCOL nDelEndCol = nDelStartCol -
rCxt.mnColDelta - 1;
+
+if (nDelStartCol <= aAbs.Col() && aAbs.Col() <=
nDelEndCol)
+{
+// This reference is deleted.
+rRef.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+}
+
if (adjustSingleRefInName(rRef, rCxt, rPos, nullptr))
aRes.mbReferenceModified = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Dictionary_gd.mk gd_GB/description.xml gd_GB/dictionaries gd_GB/dictionaries.xcu gd_GB/gd_GB.aff gd_GB/gd_GB.dic gd_GB/README_gd_GB.txt
Dictionary_gd.mk | 11 gd_GB/README_gd_GB.txt |4 gd_GB/description.xml|2 gd_GB/dictionaries.xcu |2 gd_GB/dictionaries/gd_GB.aff | 145 gd_GB/gd_GB.aff | 374 gd_GB/gd_GB.dic |65222 ++- 7 files changed, 53420 insertions(+), 12340 deletions(-) New commits: commit 93db4f58c3b2e43003c49d33ce203bdcc8db0b93 Author: Aron Budea Date: Tue Jun 20 00:36:16 2017 +0200 tdf#108439: update Scottish Gaelic dictionary to 3.3 Change-Id: Id08f755bd6e4001d91a5c6129c0d07522d9cefec Reviewed-on: https://gerrit.libreoffice.org/38985 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/Dictionary_gd.mk b/Dictionary_gd.mk index c086bce..bf9 100644 --- a/Dictionary_gd.mk +++ b/Dictionary_gd.mk @@ -9,12 +9,11 @@ $(eval $(call gb_Dictionary_Dictionary,dict-gd,dictionaries/gd_GB)) -$(eval $(call gb_Dictionary_add_root_file,dict-gd,dictionaries/gd_GB/LICENSES-en.txt)) - -$(eval $(call gb_Dictionary_add_files,dict-gd,dictionaries,\ - dictionaries/gd_GB/dictionaries/gd_GB.aff \ - dictionaries/gd_GB/dictionaries/gd_GB.dic \ - dictionaries/gd_GB/dictionaries/README_gd_GB.txt \ +$(eval $(call gb_Dictionary_add_root_files,dict-gd,\ + dictionaries/gd_GB/gd_GB.aff \ + dictionaries/gd_GB/gd_GB.dic \ + dictionaries/gd_GB/LICENSES-en.txt \ + dictionaries/gd_GB/README_gd_GB.txt \ )) # vim: set noet sw=4 ts=4: diff --git a/gd_GB/dictionaries/README_gd_GB.txt b/gd_GB/README_gd_GB.txt similarity index 99% rename from gd_GB/dictionaries/README_gd_GB.txt rename to gd_GB/README_gd_GB.txt index d5ec6da..cc7b6bb 100644 --- a/gd_GB/dictionaries/README_gd_GB.txt +++ b/gd_GB/README_gd_GB.txt @@ -1,11 +1,11 @@ 1. Version -This is version 3.1 of hunspell-gd. +This is version 3.3 of hunspell-gd. 2. Copyright -Copyright 2010-2015 Am Faclair Beag +Copyright 2010, 2011, 2012 Am Faclair Beag This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gd_GB/description.xml b/gd_GB/description.xml index f4332ff..15a7085 100644 --- a/gd_GB/description.xml +++ b/gd_GB/description.xml @@ -18,7 +18,7 @@ - +
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit acb2bd197785a9ca715cf4e991f702bd60cd6960 Author: Aron Budea Date: Tue Jun 20 00:36:16 2017 +0200 Updated core Project: dictionaries 93db4f58c3b2e43003c49d33ce203bdcc8db0b93 tdf#108439: update Scottish Gaelic dictionary to 3.3 Change-Id: Id08f755bd6e4001d91a5c6129c0d07522d9cefec Reviewed-on: https://gerrit.libreoffice.org/38985 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/dictionaries b/dictionaries index c1631744a577..93db4f58c3b2 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit c1631744a57759f139a94884191dd29facca795a +Subproject commit 93db4f58c3b2e43003c49d33ce203bdcc8db0b93 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/headless
vcl/headless/svpbmp.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8f81f6f743094d05a49f65c0f1ec8d99654780e6
Author: Caolán McNamara
Date: Sat Jun 17 21:16:34 2017 +0100
ofz#2287 check multiply
Change-Id: Ibc4c93ac1f5686a476b5e303347dc951daa58e33
Reviewed-on: https://gerrit.libreoffice.org/38910
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 5be976fc9e74..5ff0b0a978ee 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -135,8 +135,10 @@ BitmapBuffer* ImplCreateDIB(
pDIB->maPalette.SetEntryCount( nColors );
}
-const size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
-if (size > SAL_MAX_INT32/2)
+size_t size;
+bFail = o3tl::checked_multiply(pDIB->mnHeight,
pDIB->mnScanlineSize, size);
+SAL_WARN_IF(bFail, "vcl.gdi", "checked multiply failed");
+if (bFail || size > SAL_MAX_INT32/2)
{
delete pDIB;
return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/headless
vcl/headless/svpbmp.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 67caad3c98d045b8de3e4bf2f63efda2e9d8cc48
Author: Caolán McNamara
Date: Sat Jun 17 21:16:34 2017 +0100
ofz#2287 check multiply
Change-Id: Ibc4c93ac1f5686a476b5e303347dc951daa58e33
Reviewed-on: https://gerrit.libreoffice.org/38911
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 71c5e52586c6..02aa41b66bc5 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -135,7 +135,15 @@ BitmapBuffer* ImplCreateDIB(
try
{
-size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
+size_t size;
+bFail = o3tl::checked_multiply(pDIB->mnHeight,
pDIB->mnScanlineSize, size);
+SAL_WARN_IF(bFail, "vcl.gdi", "checked multiply failed");
+if (bFail)
+{
+delete pDIB;
+return nullptr;
+}
+
pDIB->mpBits = new sal_uInt8[size];
#ifdef __SANITIZE_ADDRESS__
if (!pDIB->mpBits)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - filter/source
filter/source/msfilter/svdfppt.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 14141f72d6019cad66796ab12aaec686ae4db439 Author: Caolán McNamara Date: Wed Jun 21 09:16:33 2017 +0100 ofz#2332 fix dangling pCObj Change-Id: Ifa62b1ce2aefa939cfceb2e110d126b785cb6e26 Reviewed-on: https://gerrit.libreoffice.org/39034 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d51b2a811b78..43449eb59337 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2937,6 +2937,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* pPtr->pAObj = nullptr; if (pPtr->pBObj == rSlidePersist.pBObj) pPtr->pBObj = nullptr; +if (pPtr->pCObj == rSlidePersist.pBObj) +pPtr->pCObj = nullptr; } } SdrObject::Free(rSlidePersist.pBObj); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - filter/source
filter/source/msfilter/svdfppt.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit d185c58fcf8d7b82bc84b16b56020c3fbaf2a876 Author: Caolán McNamara Date: Wed Jun 21 09:16:33 2017 +0100 ofz#2332 fix dangling pCObj Change-Id: Ifa62b1ce2aefa939cfceb2e110d126b785cb6e26 Reviewed-on: https://gerrit.libreoffice.org/39035 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f7f9c18117ee..efbb46db0c89 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2914,6 +2914,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* pPtr->pAObj = nullptr; if (pPtr->pBObj == rSlidePersist.pBObj) pPtr->pBObj = nullptr; +if (pPtr->pCObj == rSlidePersist.pBObj) +pPtr->pCObj = nullptr; } } SdrObject::Free(rSlidePersist.pBObj); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/scmatrix.cxx | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
New commits:
commit d3b77628efc72d857c63c8fb91d7ed2b499ac860
Author: Eike Rathke
Date: Wed Jun 21 23:42:25 2017 +0200
Resolves: tdf#108292 WalkAndMatchElements: really limit the match
... to the columns queried, not just when entering an mdds node. Otherwise
it
would return an unexpected index, plus bailing out early spares unnecessary
comparisons for the rest of a node block.
Regression of
commit 3fed166279377f7ad702b8911899243b8adff3bf
Date: Fri Aug 16 16:29:38 2013 +0200
that started to use
commit 7334f8db6f6004d48e2dbf014f27878a7ae21eb1
Date: Fri Aug 16 16:29:27 2013 +0200
with its bad implementation.
Just that VLOOKUP on a matrix with a larger block of same typed data as the
query *and* a match in an excess column seems to be rare..
Change-Id: Ia4ef3fd56490de82910d5aa13a84be2de851f9b0
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 675c05c8881e..812c956bae05 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1284,6 +1284,8 @@ public:
size_t getMatching() const { return mnResult; }
+size_t getRemainingCount() const { return ((mnCol2 + 1) * maSize.row) -
mnIndex; }
+
size_t compare(const MatrixImplType::element_block_node_type& node) const;
void operator() (const MatrixImplType::element_block_node_type& node)
@@ -1293,7 +1295,7 @@ public:
return;
// limit lookup to the requested columns
-if ((mnCol1 * maSize.row) <= mnIndex && mnIndex < ((mnCol2 + 1) *
maSize.row))
+if ((mnCol1 * maSize.row) <= mnIndex && getRemainingCount() > 0)
{
mnResult = compare(node);
}
@@ -1314,7 +1316,8 @@ size_t WalkAndMatchElements::compare(const
MatrixImplType::element_block
block_type::const_iterator it = block_type::begin(*node.data);
block_type::const_iterator itEnd = block_type::end(*node.data);
-for (; it != itEnd; ++it, nCount++)
+const size_t nRemaining = getRemainingCount();
+for (; it != itEnd && nCount < nRemaining; ++it, ++nCount)
{
if (*it == maMatchValue)
{
@@ -1329,7 +1332,8 @@ size_t WalkAndMatchElements::compare(const
MatrixImplType::element_block
block_type::const_iterator it = block_type::begin(*node.data);
block_type::const_iterator itEnd = block_type::end(*node.data);
-for (; it != itEnd; ++it, ++nCount)
+const size_t nRemaining = getRemainingCount();
+for (; it != itEnd && nCount < nRemaining; ++it, ++nCount)
{
if (int(*it) == maMatchValue)
{
@@ -1359,7 +1363,8 @@ size_t
WalkAndMatchElements::compare(const MatrixImplType::el
block_type::const_iterator it = block_type::begin(*node.data);
block_type::const_iterator itEnd = block_type::end(*node.data);
-for (; it != itEnd; ++it, ++nCount)
+const size_t nRemaining = getRemainingCount();
+for (; it != itEnd && nCount < nRemaining; ++it, ++nCount)
{
if (it->getDataIgnoreCase() ==
maMatchValue.getDataIgnoreCase())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/ui/view/viewdata.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 1fa02810cb946733a22519e8df0c8a2608fcd084
Author: Eike Rathke
Date: Wed Jun 21 17:42:42 2017 +0200
Resolves: tdf#108654 check nTabNo against maTabData size
ScViewData::DeleteTab() and DeleteTabs() never did that and worked by
accident
for which commit 73dec49802ef8fc42c5719efaa42a33cde68e569 removed the
grounding..
Change-Id: I95460cd017d558c073df7891551d0251009dc1d4
(cherry picked from commit 87cbbdc98d78c3c15f7161de6fec93d8680ee1de)
Reviewed-on: https://gerrit.libreoffice.org/39066
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 54fc06227563..789e84c17e46 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -546,6 +546,11 @@ void ScViewData::DeleteTab( SCTAB nTab )
delete maTabData.at(nTab);
maTabData.erase(maTabData.begin() + nTab);
+if (static_cast(nTabNo) >= maTabData.size())
+{
+EnsureTabDataSize(1);
+nTabNo = maTabData.size() - 1;
+}
UpdateCurrentTab();
mpMarkData->DeleteTab( nTab );
}
@@ -559,6 +564,11 @@ void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
}
maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+ nTab+nSheets);
+if (static_cast(nTabNo) >= maTabData.size())
+{
+EnsureTabDataSize(1);
+nTabNo = maTabData.size() - 1;
+}
UpdateCurrentTab();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/ui/view/viewdata.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 031bca731e914b309d59cc685839d14786bb615c
Author: Eike Rathke
Date: Wed Jun 21 17:45:46 2017 +0200
Assert that nTabNo fits maTabData, tdf#108654 related
Change-Id: I30b95f69a71317896d86e36b1b926c703f1539d1
(cherry picked from commit 0fed0829a601aaed6134bbc689b394e38c830605)
Reviewed-on: https://gerrit.libreoffice.org/39067
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index f4daf380d684..54fc06227563 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -502,6 +502,7 @@ ScViewData::~ScViewData()
void ScViewData::UpdateCurrentTab()
{
+assert(0 <= nTabNo && static_cast(nTabNo) < maTabData.size());
pThisTab = maTabData[nTabNo];
while (!pThisTab)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/sal offapi/com offapi/UnoApi_offapi.mk postprocess/Rdb_services.mk xmlsecurity/inc xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Lib
include/sal/log-areas.dox |1 offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/security/CertificateKind.idl | 33 + offapi/com/sun/star/security/XCertificate.idl |8 postprocess/Rdb_services.mk |3 xmlsecurity/Library_xmlsecurity.mk|6 xmlsecurity/Library_xsec_gpg.mk | 75 --- xmlsecurity/Library_xsec_xmlsec.mk| 20 xmlsecurity/Module_xmlsecurity.mk |6 xmlsecurity/inc/certificatechooser.hxx|8 xmlsecurity/inc/digitalsignaturesdialog.hxx |4 xmlsecurity/inc/documentsignaturemanager.hxx |6 xmlsecurity/inc/framework/signatureverifierimpl.hxx |3 xmlsecurity/inc/gpg/SEInitializer.hxx |5 xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx |1 xmlsecurity/inc/sigstruct.hxx |4 xmlsecurity/inc/xmlsec/xmlsec_init.hxx| 20 xmlsecurity/inc/xmlsec/xmlstreamio.hxx|8 xmlsecurity/inc/xmlsignaturehelper.hxx|3 xmlsecurity/inc/xsecctl.hxx |8 xmlsecurity/qa/unit/signing/signing.cxx | 12 xmlsecurity/source/component/documentdigitalsignatures.cxx| 15 xmlsecurity/source/dialogs/certificatechooser.cxx | 19 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx| 96 ++-- xmlsecurity/source/gpg/CertificateImpl.cxx| 57 ++ xmlsecurity/source/gpg/CertificateImpl.hxx|5 xmlsecurity/source/gpg/SEInitializer.cxx |7 xmlsecurity/source/gpg/SecurityEnvironment.cxx| 49 +- xmlsecurity/source/gpg/SecurityEnvironment.hxx|5 xmlsecurity/source/gpg/XMLSecurityContext.cxx | 20 xmlsecurity/source/gpg/XMLSecurityContext.hxx | 10 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 203 ++ xmlsecurity/source/helper/documentsignaturehelper.cxx |3 xmlsecurity/source/helper/documentsignaturemanager.cxx| 128 -- xmlsecurity/source/helper/xmlsignaturehelper.cxx | 10 xmlsecurity/source/helper/xsecctl.cxx | 91 +++- xmlsecurity/source/helper/xsecparser.cxx | 36 + xmlsecurity/source/helper/xsecparser.hxx |4 xmlsecurity/source/helper/xsecsign.cxx| 23 + xmlsecurity/source/helper/xsecverify.cxx | 46 ++ xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |5 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |3 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |5 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |2 xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 23 - xmlsecurity/source/xmlsec/xmlsec_init.cxx | 47 ++ xmlsecurity/source/xmlsec/xmlstreamio.cxx |4 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 13 xmlsecurity/util/xsec_gpg.component | 25 - 49 files changed, 825 insertions(+), 364 deletions(-) New commits: commit 3e3b37ca4cbc881628a71715b67ac172018cf9f2 Author: Thorsten Behrens Date: Sun May 21 14:28:57 2017 +0200 gpg4libre: backport OpenPGP signing from master This squashes the following commits: - gpg4libre: share static xmlsec lib between nss and gpg - gpg4libre: fix gpg signature generation - gpg4libre: initial GPG signature validation - gpg4libre: Make signature dialog work with two signing services - gpg4libre: Having this dllpublic should be fine now since it's in inc/ - gpg4libre: fix build, explicit ctor call - gpg4libre: now use the gpg security env - gpg4libre: [API-CHANGE] add certificate kind (X509 vs. OpenPGP) - gpg4libre: List both (x509 and gpg) existing signatures - gpg4libre: Init xmlsec in one place before creating the gpg/x509 services - gpg4libre: write PGPData info, get more metadata out for gpg key - gpg4libre: Fixup unit tests, now that SecurityContext is needed - gpg4libre: Make viewing signatures work for gpg signatures - gpg4libre: some code improvements, add metadata for OpenPGP keys - gpg4libre: make signature impl swappable in-situ during validation - gpg4libre: actually take key fro
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - oox/source sd/qa
oox/source/ppt/presentationfragmenthandler.cxx |4 ++--
sd/qa/unit/data/pptx/tdf89064.pptx |binary
sd/qa/unit/import-tests.cxx| 13 +
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 814dbf3624b9e8608882b003d96dfb51fa3634fc
Author: Paul Trojahn
Date: Tue Jun 6 23:05:10 2017 +0200
tdf#89064 Fix import of pages with comments and notes
importSlide removes the shapes on the page. It was used to import
the comments and authors, which resulted in an empty notes page.
Change-Id: I7d68085b482e5497d46e92328c413c87440714a0
Reviewed-on: https://gerrit.libreoffice.org/38648
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit c2da33ead8b093b12ebb9a0ea9c06d156c41a3e6)
Reviewed-on: https://gerrit.libreoffice.org/39043
Reviewed-by: Paul Trojahn
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index 8dc1392bed81..30f9af5e1301 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -301,7 +301,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32
nSlide, bool bFirstPage
pCommentAuthorsPersistPtr,
Slide ) );
-importSlide( xCommentAuthorsFragmentHandler,
pCommentAuthorsPersistPtr );
+getFilter().importFragment( xCommentAuthorsFragmentHandler );
maAuthorList.setValues(
pCommentAuthorsPersistPtr->getCommentAuthors() );
}
if( !aCommentFragmentPath.isEmpty() )
@@ -323,7 +323,7 @@ void PresentationFragmentHandler::importSlide(sal_uInt32
nSlide, bool bFirstPage
pCommentsPersistPtr,
Slide ) );
pCommentsPersistPtr->getCommentsList().cmLst.clear();
-importSlide( xCommentsFragmentHandler, pCommentsPersistPtr );
+getFilter().importFragment( xCommentsFragmentHandler );
if (!pCommentsPersistPtr->getCommentsList().cmLst.empty())
{
diff --git a/sd/qa/unit/data/pptx/tdf89064.pptx
b/sd/qa/unit/data/pptx/tdf89064.pptx
new file mode 100644
index ..312496f79ad0
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf89064.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index d52eda84d41a..da02f49c6946 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -158,6 +159,7 @@ public:
void testTdf105150();
void testTdf105150PPT();
void testTdf100926();
+void testTdf89064();
bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber,
std::vector& rExpected);
void testPatternImport();
@@ -225,6 +227,7 @@ public:
CPPUNIT_TEST(testTdf105150PPT);
CPPUNIT_TEST(testTdf100926);
CPPUNIT_TEST(testPatternImport);
+CPPUNIT_TEST(testTdf89064);
CPPUNIT_TEST_SUITE_END();
};
@@ -2183,6 +2186,16 @@ void SdImportTest::testTdf100926()
xDocShRef->DoClose();
}
+void SdImportTest::testTdf89064()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf89064.pptx"),
PPTX);
+uno::Reference< presentation::XPresentationPage > xPage (getPage(0,
xDocShRef), uno::UNO_QUERY_THROW);
+uno::Reference< drawing::XDrawPage > xNotesPage (xPage->getNotesPage(),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), xNotesPage->getCount());
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml | 40 sw/uiconfig/swriter/popupmenu/table.xml | 10 sw/uiconfig/swriter/popupmenu/text.xml | 10 3 files changed, 30 insertions(+), 30 deletions(-) New commits: commit fb7f91acecb6a3fa7adbe59603cdfdbc36a6b891 Author: Caolán McNamara Date: Tue Jun 20 10:44:13 2017 +0100 these checkbox group entries are mutually exclusive so they're closer to radio buttons than checkboxes though this isn't great either as there are possibilites that are not listed, in which case all are unchecked, and when is selected like buletting it cannot be turned off from the menu (cherry picked from commit 4d7054947d87174decf12ad204c09532f33599f8) Change-Id: Ifa9650cdde5575807c0bd876e859c3ba3748e580 Reviewed-on: https://gerrit.libreoffice.org/39008 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index f7ca5750f37e..5e7dbb6374a4 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -564,26 +564,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml index a65f150522f5..5d6992de58b6 100644 --- a/sw/uiconfig/swriter/popupmenu/table.xml +++ b/sw/uiconfig/swriter/popupmenu/table.xml @@ -77,11 +77,11 @@ - - - - - + + + + + diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml index da39a8239b48..6f689036a5c6 100644 --- a/sw/uiconfig/swriter/popupmenu/text.xml +++ b/sw/uiconfig/swriter/popupmenu/text.xml @@ -48,11 +48,11 @@ - - - - - + + + + + ___ 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/contact/viewobjectcontactofgraphic.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit aa58890324bf15560c66fcb58a19c169da228c2e
Author: Caolán McNamara
Date: Wed Jun 21 13:09:54 2017 +0100
Resolves: tdf#108610 crash on double delete of async event
regression from...
commit e4e4d5713e248f02faf7aa6199b11e152973de8e
Date: Wed May 31 15:40:25 2017 +0200
clang-tidy readability-delete-null-pointer
which in turn triggered some loplugin:useuniqueptr
lets revert the fix of
commit 93a288bd75d7caed46d6f29bf006f3d97a9602a9
Date: Mon Jun 12 21:44:57 2017 +0200
svx: fix the std::unique_ptr that deletes itself twice
and make the code do exactly like it always did pre initial change
Change-Id: Ia922fccdc476e40b5c672b097b04c229215ce38e
Reviewed-on: https://gerrit.libreoffice.org/39052
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 98a8c8b1b416..70d676a4ddef 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -207,7 +207,7 @@ namespace sdr
// #i103720# forget event to avoid possible deletion by the
following ActionChanged call
// which may use
createPrimitive2DSequence/impPrepareGraphicWithAsynchroniousLoading again.
// Deletion is actually done by the scheduler who leaded to coming
here
-mpAsynchLoadEvent = nullptr;
+mpAsynchLoadEvent.release();
// Invalidate all paint areas and check existing animation (which
may have changed).
GetViewContact().ActionChanged();
@@ -226,7 +226,7 @@ namespace sdr
"ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent: Forced to forget
another event then I have scheduled (?)");
// forget event
-mpAsynchLoadEvent = nullptr;
+mpAsynchLoadEvent.release();
}
}
@@ -302,8 +302,6 @@ namespace sdr
ViewObjectContactOfGraphic::~ViewObjectContactOfGraphic()
{
-// explicitly call this to avoid it double-freeing itself
-forgetAsynchGraphicLoadingEvent(mpAsynchLoadEvent.get());
}
} // end of namespace contact
} // end of namespace sdr
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 17 commits - include/sal offapi/com offapi/UnoApi_offapi.mk postprocess/Rdb_services.mk xmlsecurity/inc xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_gpg.
include/sal/log-areas.dox |1 offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/security/CertificateKind.idl | 33 + offapi/com/sun/star/security/XCertificate.idl |8 postprocess/Rdb_services.mk |3 xmlsecurity/Library_xmlsecurity.mk|6 xmlsecurity/Library_xsec_gpg.mk | 75 --- xmlsecurity/Library_xsec_xmlsec.mk| 20 xmlsecurity/Module_xmlsecurity.mk |6 xmlsecurity/inc/certificatechooser.hxx|8 xmlsecurity/inc/digitalsignaturesdialog.hxx |4 xmlsecurity/inc/documentsignaturemanager.hxx |6 xmlsecurity/inc/framework/signatureverifierimpl.hxx |3 xmlsecurity/inc/gpg/SEInitializer.hxx |5 xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx |1 xmlsecurity/inc/sigstruct.hxx |4 xmlsecurity/inc/xmlsec/xmlsec_init.hxx| 20 xmlsecurity/inc/xmlsec/xmlstreamio.hxx|8 xmlsecurity/inc/xmlsignaturehelper.hxx|3 xmlsecurity/inc/xsecctl.hxx |8 xmlsecurity/qa/unit/signing/signing.cxx | 12 xmlsecurity/source/component/documentdigitalsignatures.cxx| 15 xmlsecurity/source/dialogs/certificatechooser.cxx | 19 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx| 96 ++-- xmlsecurity/source/gpg/CertificateImpl.cxx| 57 ++ xmlsecurity/source/gpg/CertificateImpl.hxx|5 xmlsecurity/source/gpg/SEInitializer.cxx |7 xmlsecurity/source/gpg/SecurityEnvironment.cxx| 49 +- xmlsecurity/source/gpg/SecurityEnvironment.hxx|5 xmlsecurity/source/gpg/XMLSecurityContext.cxx | 20 xmlsecurity/source/gpg/XMLSecurityContext.hxx | 10 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 203 ++ xmlsecurity/source/helper/documentsignaturehelper.cxx |3 xmlsecurity/source/helper/documentsignaturemanager.cxx| 128 -- xmlsecurity/source/helper/xmlsignaturehelper.cxx | 10 xmlsecurity/source/helper/xsecctl.cxx | 91 +++- xmlsecurity/source/helper/xsecparser.cxx | 36 + xmlsecurity/source/helper/xsecparser.hxx |4 xmlsecurity/source/helper/xsecsign.cxx| 23 + xmlsecurity/source/helper/xsecverify.cxx | 46 ++ xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |5 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |3 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |5 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |2 xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 23 - xmlsecurity/source/xmlsec/xmlsec_init.cxx | 47 ++ xmlsecurity/source/xmlsec/xmlstreamio.cxx |4 xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 13 xmlsecurity/util/xsec_gpg.component | 25 - 49 files changed, 825 insertions(+), 364 deletions(-) New commits: commit f9a14f3d021d78bded54cde0462669ea10d7c546 Author: Thorsten Behrens Date: Wed Jun 21 21:32:38 2017 +0200 gpg4libre: fix build for windows and mac Change-Id: I3e36b22cefba4c6195bcf8b85b3f7a2cc101b845 diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 0df6c08f29ef..795745fe851b 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -22,7 +22,9 @@ #include "documentsignaturehelper.hxx" #include "framework/saxeventkeeperimpl.hxx" #include "xmlsec/xmldocumentwrapper_xmlsecimpl.hxx" -#include "gpg/xmlsignature_gpgimpl.hxx" +#if !defined(MACOSX) && !defined(WNT) +# include "gpg/xmlsignature_gpgimpl.hxx" +#endif #include #include @@ -125,10 +127,12 @@ void XSecController::createXSecComponent( ) cssu::Reference< cssl::XMultiComponentFactory > xMCF( mxCtx->getServiceManager() ); +#if !defined(MACOSX) && !defined(WNT) uno::Reference< lang::XServiceInfo > xServiceInfo( m_xSecurityContext, cssu::UNO_QUERY ); if (xServiceInfo->getImplementationName() == "com.sun.star.xml.security.gpg.XMLSecurityContext_GpgImpl") m_xXMLSignature.set(new XMLSignature_GpgImpl())
[GSoC] QuarkXPress import, Week 3
During this week we continued reverse engineering of QuarkXPress 3-4 format and had some substantial progress: - Completed object type identification (shape type, content type). - Refactored object parsing and improved size identification (QXP does not store sizes/offsets for object records), which should cover most cases now. Currently only for QXP 3.3, but it should not be difficult to implement in QXP 4, it's very similar. - Finished parsing of paragraph styles, rules, tabs. - Refactored and improved parsing of document structure, block chains. This should be the ultimate version of it: we may identify new records and details, but there probably will not be any major changes in document parsing. - Identified some object properties: color shade, line/frame style, gap color, text inset, vertical alignment, baseline offset, ... Looks like we identified most of the object properties except some more advanced such as picture cropping. - Parsing of QXP 4 object properties (they are mostly the same, sometimes different order or size). - Linked text boxes. - Object groups. - Some progress with QXP 4 deobfuscation, but there are still major issues. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7621ff47d053c242b6140627a48e114759c3e8f Author: Christian Lohmaier Date: Wed Jun 21 20:49:57 2017 +0200 Updated core Project: translations 07764d62453dddf771ee1692a65e19588f87edc5 update translations for 5.4.0 rc1 and force-fix errors using pocheck Change-Id: Ie086d580cf55f92d4b916a9822c82cf6bb4130e5 (cherry picked from commit 3a8e01f5e88f26c3a455d3cf8c2b92c3d7b11422) diff --git a/translations b/translations index c460968e1622..07764d62453d 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit c460968e1622de007c4d8a222e95b065c1776c15 +Subproject commit 07764d62453dddf771ee1692a65e19588f87edc5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f172c37f8f51d0f6a323045828e5b1b434fe6735 Author: Christian Lohmaier Date: Wed Jun 21 20:49:57 2017 +0200 Updated core Project: translations 3a8e01f5e88f26c3a455d3cf8c2b92c3d7b11422 update translations for 5.4.0 rc1 and force-fix errors using pocheck Change-Id: Ie086d580cf55f92d4b916a9822c82cf6bb4130e5 diff --git a/translations b/translations index 633cd820822b..3a8e01f5e88f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 633cd820822ba89da7d410cf8bed009c2ffd3d47 +Subproject commit 3a8e01f5e88f26c3a455d3cf8c2b92c3d7b11422 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/gpg4libre-5-4'
New branch 'feature/gpg4libre-5-4' available with the following commits: commit 16bed2cbc83a3e5bd963324814e64d89f686e849 Author: Thorsten Behrens Date: Wed Jun 21 18:53:23 2017 +0200 gpg4libre: actually take key from user selection Change-Id: I6b18865913492d41a8e0206a430e267fe78c553a commit 7d6a00f3a79d75dd4cb4badb722dce15e05e5dce Author: Thorsten Behrens Date: Wed Jun 21 18:00:55 2017 +0200 gpg4libre: make signature impl swappable in-situ during validation Sadly we only know whether its a OpenPGP or X509 signature during parsing, so we need to switch the implementation mid-way Change-Id: Ib48a9da0105de62cfecda095df8c154b59ba8c40 commit 1f0e966e4c432928bc67a0112219b995faaec984 Author: Thorsten Behrens Date: Wed Jun 21 16:54:52 2017 +0200 wip Change-Id: I1beb692b9a9a34b5f0cf743ba9e4a145ac582184 commit fa0f5dc36746519074af5dfad04627a9d2c8345a Author: Samuel Mehrbrodt Date: Wed Jun 21 16:22:32 2017 +0200 gpg4libre: Make viewing signatures work for gpg signatures Change-Id: Ic10846cb87e23ca9ffa0eb0d64c56fcf79c73a9d commit 4ffdac6fc13d9fe4cc4704399fd816382d886b32 Author: Katarina Behrens Date: Wed Jun 21 13:34:30 2017 +0200 gpg4libre: Fixup unit tests, now that SecurityContext is needed Change-Id: Ifa43fa735c8b0d58ff3d3deca2ad4eca6560494a commit c58a34c033e9793e2d7dd03158f24ce364abe0bb Author: Thorsten Behrens Date: Tue Jun 20 23:52:18 2017 +0200 gpg4libre: write PGPData info, get more metadata out for gpg key Change-Id: Ia560869ec02fca7fe4219136e1fe939e13f1e4c2 commit ca8215d09f4b2e944ac3af1c80495ea4384ac655 Author: Samuel Mehrbrodt Date: Tue Jun 20 14:49:10 2017 +0200 gpg4libre: Init xmlsec in one place before creating the gpg/x509 services Change-Id: I0308d586344b5e52ad327f6650b62ac0eac7ecb9 commit 5044738707b17a07ce084b2087adbba6738ad5fb Author: Samuel Mehrbrodt Date: Tue Jun 20 10:58:26 2017 +0200 gpg4libre: List both (x509 and gpg) existing signatures Change-Id: I57ae79f7632885bf5c5aadcad3fb5ad4a5a9413d commit 355d9cc22fadcda04edf149ff3ab5e43b14a6e9e Author: Katarina Behrens Date: Mon Jun 19 23:36:12 2017 +0200 API Change or what: add certificate kind (X509 vs. OpenPGP) Change-Id: I423bef41f93af9d1b78ee9795be7ec33c3c7ae0c commit 6cc4b129629ae6e202ff909946a4bc83cb0e57c5 Author: Thorsten Behrens Date: Mon Jun 19 03:42:15 2017 +0200 gpp impl: now use sec env Change-Id: I84e4d6872aab27f5b11ec727787a2eab80ef6a66 commit 126f6ac40121b5a5af1c6ae8361c38c4091ea49c Author: Thorsten Behrens Date: Sat Jun 17 09:56:04 2017 +0200 gpg4libre: fix build, explicit ctor call Change-Id: Iec7ca4e37d6f5c4f63aaa22acfa0bdd395747471 commit 7a39877430325fce80c21761822d5cc332ba4d1b Author: Samuel Mehrbrodt Date: Fri Jun 16 15:30:30 2017 +0200 gpg4libre: Having this dllpublic should be fine now since it's in inc/ Change-Id: I79c132e717a62c6274eeafe33d732616cbd6a5a6 commit 9e1fd2c2eaaba5899d41418391b19532eba35621 Author: Samuel Mehrbrodt Date: Fri Jun 16 15:24:06 2017 +0200 gpg4libre: Make signature dialog work with two signing services Change-Id: I0b47e6dba38222bb6b4f778c4206d3b37bc93089 commit 0c54091758bffc2acb882f7d0ec0e72dee26e0c0 Author: Thorsten Behrens Date: Tue May 30 02:40:04 2017 +0200 gpg4libre: hacked to work Change-Id: Ic998ddb2aa791b2b0430f12280b1c1dc36a013d2 commit 04ea227b9dcadd405415807f7a99b86624963439 Author: Thorsten Behrens Date: Wed May 24 07:03:23 2017 +0200 gpg4libre: initial GPG signature validation Change-Id: I80afd77f74a6cb3f3fb7da03a6a4b74b132360d2 commit ac02fd6175598cd0b37ed88134fab7c6a629baf5 Author: Thorsten Behrens Date: Tue May 23 23:08:02 2017 +0200 gpg4libre: fix gpg signature generation Change-Id: I6eb95c948b6c8c9b8dee21215b430921bf454bb9 commit 13d13b1444bd98299b66c85d269390cbdf25282f Author: Thorsten Behrens Date: Sun May 21 14:28:57 2017 +0200 gpg4libre: share static xmlsec lib between nss and gpg In the end, the gpgme implementation uses enough of xmlsec functionality that splitting those (and ending up with two copies) was just not worth it. Change-Id: Ida87c848e4e6a770e3c697add9ceb589a9ec3930 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/editeng
include/editeng/editdata.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 452ad2afc5a474f78783ddabd04980e962532935
Author: Noel Grandin
Date: Wed Jun 21 13:27:40 2017 +0200
remove unused EE_READWRITE constants
just as well EE_READWRITE_GENERALERROR is unused, since it's value
overlaps with ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS
Change-Id: I9752d78ae8510f650d709ee0d4f28b536494ec06
Reviewed-on: https://gerrit.libreoffice.org/39057
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 4c493865659f..be5cc4377077 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -55,9 +55,7 @@ enum class EEAnchorMode {
EDITENG_DLLPUBLIC extern const size_t EE_APPEND;
// Error messages for Read / Write Method
-#define EE_READWRITE_OK ERRCODE_NONE
#define EE_READWRITE_WRONGFORMAT ErrCode(SVSTREAM_ERRBASE_USER+1)
-#define EE_READWRITE_GENERALERRORErrCode(SVSTREAM_ERRBASE_USER+2)
#define EDITUNDO_REMOVECHARS100
#define EDITUNDO_CONNECTPARAS 101
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source basic/source include/basic scripting/source
basctl/source/basicide/baside2b.cxx|4 ++--
basic/source/classes/sb.cxx|4 ++--
basic/source/runtime/methods1.cxx |4 ++--
basic/source/runtime/runtime.cxx |2 +-
basic/source/sbx/sbxarray.cxx |2 +-
basic/source/sbx/sbxbase.cxx |8
basic/source/sbx/sbxbool.cxx |2 +-
basic/source/sbx/sbxbyte.cxx |2 +-
basic/source/sbx/sbxchar.cxx |2 +-
basic/source/sbx/sbxdbl.cxx|2 +-
basic/source/sbx/sbxint.cxx|6 +++---
basic/source/sbx/sbxlng.cxx|2 +-
basic/source/sbx/sbxscan.cxx |8
basic/source/sbx/sbxsng.cxx|2 +-
basic/source/sbx/sbxuint.cxx |2 +-
basic/source/sbx/sbxulng.cxx |2 +-
basic/source/sbx/sbxvalue.cxx | 22 +++---
basic/source/sbx/sbxvar.cxx|4 ++--
include/basic/sbxdef.hxx |2 --
scripting/source/basprov/basscript.cxx |4 ++--
20 files changed, 42 insertions(+), 44 deletions(-)
New commits:
commit 14c763e793780fec3f4e6280db437e4cda8bbd7c
Author: Noel Grandin
Date: Wed Jun 21 12:45:21 2017 +0200
s/ERRCODE_SBX_OK/ERRCODE_NONE
adds no value
Change-Id: Iedf7a6a7be28fed4059b576312890be8cbb980d7
Reviewed-on: https://gerrit.libreoffice.org/39056
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index b4e449b99fa9..6c025eec93b6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1945,7 +1945,7 @@ void StackWindow::UpdateCalls()
}
SbxBase::ResetError();
-if( eOld != ERRCODE_SBX_OK )
+if( eOld != ERRCODE_NONE )
SbxBase::SetError( eOld );
}
else
@@ -2581,7 +2581,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
Invalidate();
SbxBase::ResetError();
-if( eOld != ERRCODE_SBX_OK )
+if( eOld != ERRCODE_NONE )
SbxBase::SetError( eOld );
setBasicWatchMode( false );
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index af541630b8de..4a37061eafd4 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -986,7 +986,7 @@ StarBASIC::~StarBASIC()
lclRemoveDocBasicItem( *this );
SbxBase::ResetError();
-if( eOld != ERRCODE_SBX_OK )
+if( eOld != ERRCODE_NONE )
{
SbxBase::SetError( eOld );
}
@@ -1357,7 +1357,7 @@ bool StarBASIC::Call( const OUString& rName, SbxArray*
pParam )
{
ErrCode eErr = SbxBase::GetError();
SbxBase::ResetError();
-if( eErr != ERRCODE_SBX_OK )
+if( eErr != ERRCODE_NONE )
{
RTError( eErr, OUString(), 0, 0, 0 );
}
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index f8ad651fae30..d6badbf225c9 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -334,7 +334,7 @@ RTLFUNC(CDbl) // JSM
// #41690
OUString aScanStr = pSbxVariable->GetOUString();
ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, nVal );
-if( Error != ERRCODE_SBX_OK )
+if( Error != ERRCODE_NONE )
{
StarBASIC::Error( Error );
}
@@ -403,7 +403,7 @@ RTLFUNC(CSng) // JSM
double dVal = 0.0;
OUString aScanStr = pSbxVariable->GetOUString();
ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, dVal,
/*bSingle=*/true );
-if( SbxBase::GetError() == ERRCODE_SBX_OK && Error !=
ERRCODE_SBX_OK )
+if( SbxBase::GetError() == ERRCODE_NONE && Error != ERRCODE_NONE )
{
StarBASIC::Error( Error );
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index f8c8ed9aec2d..998e61133fb3 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1604,7 +1604,7 @@ inline bool checkUnoStructCopy( bool bVBA,
SbxVariableRef& refVal, SbxVariableRe
// Alternatively it is possible that the same scenario
// could overwrite and existing error. Lets prevent that
SbxObjectRef xVarObj = static_cast(refVar->GetObject());
-if ( eOldErr != ERRCODE_SBX_OK )
+if ( eOldErr != ERRCODE_NONE )
SbxBase::SetError( eOldErr );
else
SbxBase::ResetError();
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 43b970ce1ee2..ae20542c798d 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -551,7 +551,7 @@ void SbxDimArray::Clear()
void SbxDimArray::AddDimImpl32( sal_Int32 lb, sal_Int32 ub, bool bAllowSize0 )
{
-ErrCode eRes = ERRCODE_SBX_OK;
+ErrCode eRes = ERRCODE_NONE
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx | 59 ++
1 file changed, 59 insertions(+)
New commits:
commit 6580e171ad054dca38f55822e67a400191cecdf5
Author: Eike Rathke
Date: Wed Jun 21 19:42:36 2017 +0200
Resolves: tdf#108671 mark named expression single reference #REF! if deleted
Probably broken already since
commit f77c9d5b3cb65d9c2e2417f60bec1113feac50e1
Date: Mon Jul 29 14:47:07 2013 -0400
Change-Id: If90a959d000a1bf5ab0804deb22d5cfad413ea5e
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1bc6c217077a..3cbbc966a3e9 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3660,6 +3660,65 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
case svSingleRef:
{
ScSingleRefData& rRef = *p->GetSingleRef();
+if (rCxt.mnRowDelta < 0)
+{
+// row(s) deleted.
+
+if (rRef.IsRowRel())
+// Don't modify relative references in names.
+break;
+
+ScAddress aAbs = rRef.toAbs(rPos);
+
+if (aAbs.Col() < rCxt.maRange.aStart.Col() ||
rCxt.maRange.aEnd.Col() < aAbs.Col())
+// column of the reference is not in the
deleted column range.
+break;
+
+if (aAbs.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+const SCROW nDelStartRow =
rCxt.maRange.aStart.Row() + rCxt.mnRowDelta;
+const SCROW nDelEndRow = nDelStartRow -
rCxt.mnRowDelta - 1;
+
+if (nDelStartRow <= aAbs.Row() && aAbs.Row() <=
nDelEndRow)
+{
+// This reference is deleted.
+rRef.SetRowDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+}
+else if (rCxt.mnColDelta < 0)
+{
+// column(s) deleted.
+
+if (rRef.IsColRel())
+// Don't modify relative references in names.
+break;
+
+ScAddress aAbs = rRef.toAbs(rPos);
+
+if (aAbs.Row() < rCxt.maRange.aStart.Row() ||
rCxt.maRange.aEnd.Row() < aAbs.Row())
+// row of the reference is not in the deleted
row range.
+break;
+
+if (aAbs.Tab() > rCxt.maRange.aEnd.Tab() ||
aAbs.Tab() < rCxt.maRange.aStart.Tab())
+// wrong tables
+break;
+
+const SCCOL nDelStartCol =
rCxt.maRange.aStart.Col() + rCxt.mnColDelta;
+const SCCOL nDelEndCol = nDelStartCol -
rCxt.mnColDelta - 1;
+
+if (nDelStartCol <= aAbs.Col() && aAbs.Col() <=
nDelEndCol)
+{
+// This reference is deleted.
+rRef.SetColDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+}
+
if (adjustSingleRefInName(rRef, rCxt, rPos, nullptr))
aRes.mbReferenceModified = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/emfplusprimitiveparser' - drawinglayer/inc drawinglayer/source
drawinglayer/inc/wmfemfhelper.hxx |5
drawinglayer/source/tools/emfpbrush.cxx | 450 +++---
drawinglayer/source/tools/emfpcustomlinecap.cxx |7
drawinglayer/source/tools/emfpfont.cxx |5
drawinglayer/source/tools/emfphelperdata.cxx| 1649
drawinglayer/source/tools/emfphelperdata.hxx|4
drawinglayer/source/tools/emfpimage.cxx | 21
drawinglayer/source/tools/emfppath.cxx | 79 -
drawinglayer/source/tools/emfppen.cxx | 77 -
drawinglayer/source/tools/emfpregion.cxx| 13
drawinglayer/source/tools/emfpstringformat.cxx |2
11 files changed, 1251 insertions(+), 1061 deletions(-)
New commits:
commit 270def2ea8819982dae0642dbbb1dd80955c5a53
Author: Armin Le Grand
Date: Wed Jun 21 19:31:32 2017 +0200
emfplus: more corrections and rough geometry
Corrected/streamlined more, added 1st rough geometry
creation to have a proof of concept. Checked the
helper classes based on EMFPObject and their derivates.
First versions of EMFPPlusDrawPolygon and
EMFPPlusFillPolygon, but the complex info in the data
objects needs more complex primitive creation. Not sure
if primitive creators like createHairlineAndFillPrimitive
will be usable, these are based on PropertyHolder info.
Also added usage of HandleNewClipRegion, that should be
usable
Change-Id: I96119be290140bee252ee21a3e1187fad60e9c7d
diff --git a/drawinglayer/inc/wmfemfhelper.hxx
b/drawinglayer/inc/wmfemfhelper.hxx
index 699b065795df..a11b6578e572 100644
--- a/drawinglayer/inc/wmfemfhelper.hxx
+++ b/drawinglayer/inc/wmfemfhelper.hxx
@@ -208,6 +208,11 @@ namespace wmfemfhelper
drawinglayer::primitive2d::Primitive2DContainer interpretMetafile(
const GDIMetaFile& rMetaFile,
const drawinglayer::geometry::ViewInformation2D& rViewInformation);
+
+void HandleNewClipRegion(
+const basegfx::B2DPolyPolygon& rClipPolyPolygon,
+TargetHolders& rTargetHolders,
+PropertyHolders& rPropertyHolders);
}
#endif
diff --git a/drawinglayer/source/tools/emfpbrush.cxx
b/drawinglayer/source/tools/emfpbrush.cxx
index c093a5682572..d55a16ad30d7 100644
--- a/drawinglayer/source/tools/emfpbrush.cxx
+++ b/drawinglayer/source/tools/emfpbrush.cxx
@@ -64,23 +64,32 @@ namespace emfplushelper
EMFPBrush::~EMFPBrush()
{
-if (blendPositions != nullptr) {
+if (blendPositions != nullptr)
+{
delete[] blendPositions;
blendPositions = nullptr;
}
-if (colorblendPositions != nullptr) {
+
+if (colorblendPositions != nullptr)
+{
delete[] colorblendPositions;
colorblendPositions = nullptr;
}
-if (colorblendColors != nullptr) {
+
+if (colorblendColors != nullptr)
+{
delete[] colorblendColors;
colorblendColors = nullptr;
}
-if (surroundColors != nullptr) {
+
+if (surroundColors != nullptr)
+{
delete[] surroundColors;
surroundColors = nullptr;
}
-if (path) {
+
+if (path)
+{
delete path;
path = nullptr;
}
@@ -95,232 +104,267 @@ namespace emfplushelper
SAL_INFO("cppcanvas.emf", "EMF+\tbrush");
SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header <<
" type: " << type << std::dec);
-switch (type) {
-case BrushTypeSolidColor:
+switch (type)
{
-sal_uInt32 color;
+case BrushTypeSolidColor:
+{
+sal_uInt32 color;
+s.ReadUInt32(color);
-s.ReadUInt32(color);
-solidColor = ::Color(0xff - (color >> 24), (color >> 16) & 0xff,
(color >> 8) & 0xff, color & 0xff);
-SAL_INFO("cppcanvas.emf", "EMF+\tsolid color: 0x" << std::hex <<
color << std::dec);
-break;
-}
-case BrushTypeHatchFill:
-{
-sal_uInt32 style;
-sal_uInt32 foregroundColor;
-sal_uInt32 backgroundColor;
-s.ReadUInt32(style);
-s.ReadUInt32(foregroundColor);
-s.ReadUInt32(backgroundColor);
-
-hatchStyle = static_cast(style);
-solidColor = ::Color(0xff - (foregroundColor >> 24),
(foregroundColor >> 16) & 0xff, (foregroundColor >> 8) & 0xff, foregroundColor
& 0xff);
-secondColor = ::Color(0xff - (backgroundColor >> 24),
(backgroundColor >> 16) & 0xff, (backgroundColor >> 8) & 0xff, backgroundColor
& 0xff);
-SAL_INFO("cppcanvas.emf", "EMF+\thatch style " << style << "
foregroundcolor: 0x" << solidColor.AsRGBHexString() << " background 0x" <<
secondColor.AsRGBHexString());
-break;
-}
-case BrushTypeTextureFill:
-{
-SAL_WARN("cppcanvas.emf", "EMF+\tTODO: imp
[Libreoffice-commits] core.git: Changes to 'feature/gpg4libre'
New branch 'feature/gpg4libre' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - chart2/source
chart2/source/controller/dialogs/res_ErrorBar.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit cc5703885ad52526e484d8172e08406b2925faf6
Author: Caolán McNamara
Date: Fri Jun 16 10:08:47 2017 +0100
only some languages put a space between number and %
Change-Id: Ifdd2f2c02738fc9e9b3fd4cbf97b211b29856df1
Reviewed-on: https://gerrit.libreoffice.org/38870
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit e89e3ca2a6ab1773a7221eac11cb60812c002005)
Reviewed-on: https://gerrit.libreoffice.org/39020
Reviewed-by: Christian Lohmaier
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 03e24cc512ce..998d57862f3c 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -258,11 +258,11 @@ void ErrorBarResources::UpdateControlStates()
( m_pRbFunction->IsChecked()) &&
( m_pLbFunction->GetSelectEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN
));
bool bIsPercentage( m_pRbPercent->IsChecked() || bIsErrorMargin );
-OUString aCustomUnit;
+FieldUnit eFieldUnit = FUNIT_NONE;
if( bIsPercentage )
{
-aCustomUnit = " %";
+eFieldUnit = FUNIT_PERCENT;
m_pMfPositive->SetDecimalDigits( 1 );
m_pMfPositive->SetSpinSize( 10 );
m_pMfNegative->SetDecimalDigits( 1 );
@@ -282,8 +282,8 @@ void ErrorBarResources::UpdateControlStates()
m_pMfPositive->SetValue( nPlusValue );
m_pMfNegative->SetValue( nMinusValue );
-m_pMfPositive->SetCustomUnitText( aCustomUnit );
-m_pMfNegative->SetCustomUnitText( aCustomUnit );
+m_pMfPositive->SetUnit(eFieldUnit);
+m_pMfNegative->SetUnit(eFieldUnit);
// positive and negative value fields
bool bPosEnabled = ( m_pRbPositive->IsChecked() || m_pRbBoth->IsChecked());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/thb/gpg4libre'
New branch 'private/thb/gpg4libre' available with the following commits: commit 524975bc2ef78514aa2253191aa7e367e008f180 Author: Thorsten Behrens Date: Wed Jun 21 18:53:23 2017 +0200 gpg4libre: actually take key from user selection Change-Id: I6b18865913492d41a8e0206a430e267fe78c553a commit ba696ca297d15aba5dab84839780f377ac455b17 Author: Thorsten Behrens Date: Wed Jun 21 18:00:55 2017 +0200 gpg4libre: make signature impl swappable in-situ during validation Sadly we only know whether its a OpenPGP or X509 signature during parsing, so we need to switch the implementation mid-way Change-Id: Ib48a9da0105de62cfecda095df8c154b59ba8c40 commit ff984c0bd73b6706e7ea4d3743ca02f715e41a78 Author: Thorsten Behrens Date: Wed Jun 21 16:54:52 2017 +0200 wip Change-Id: I1beb692b9a9a34b5f0cf743ba9e4a145ac582184 commit 3798ff9a2b8b00ef885f5c2069bc0401a3d5b9c6 Author: Samuel Mehrbrodt Date: Wed Jun 21 16:22:32 2017 +0200 gpg4libre: Make viewing signatures work for gpg signatures Change-Id: Ic10846cb87e23ca9ffa0eb0d64c56fcf79c73a9d commit ca10898e5a67809f3eb5597aeea128e7b42a7227 Author: Katarina Behrens Date: Wed Jun 21 13:34:30 2017 +0200 gpg4libre: Fixup unit tests, now that SecurityContext is needed Change-Id: Ifa43fa735c8b0d58ff3d3deca2ad4eca6560494a commit 7baefce27cfce5be158c93ea9368c55eda1c6244 Author: Thorsten Behrens Date: Tue Jun 20 23:52:18 2017 +0200 gpg4libre: write PGPData info, get more metadata out for gpg key Change-Id: Ia560869ec02fca7fe4219136e1fe939e13f1e4c2 commit 56f3154b70d921f2f74639a96d42a4dc46b77ec8 Author: Samuel Mehrbrodt Date: Tue Jun 20 14:49:10 2017 +0200 gpg4libre: Init xmlsec in one place before creating the gpg/x509 services Change-Id: I0308d586344b5e52ad327f6650b62ac0eac7ecb9 commit 7dd3b2df7a69f7e9e8eba0ad34253dff06f371a7 Author: Samuel Mehrbrodt Date: Tue Jun 20 10:58:26 2017 +0200 gpg4libre: List both (x509 and gpg) existing signatures Change-Id: I57ae79f7632885bf5c5aadcad3fb5ad4a5a9413d commit df059c7fb5cda720537156df4cfecbae2a7d89af Author: Katarina Behrens Date: Mon Jun 19 23:36:12 2017 +0200 API Change or what: add certificate kind (X509 vs. OpenPGP) Change-Id: I423bef41f93af9d1b78ee9795be7ec33c3c7ae0c commit 0eea28d3d7f06b6a3cff8e3882cca3a847d5e013 Author: Thorsten Behrens Date: Mon Jun 19 03:42:15 2017 +0200 gpp impl: now use sec env Change-Id: I84e4d6872aab27f5b11ec727787a2eab80ef6a66 commit 168dc373ce6b177ce994219ebd267cc471c00aa0 Author: Thorsten Behrens Date: Sat Jun 17 09:56:04 2017 +0200 gpg4libre: fix build, explicit ctor call Change-Id: Iec7ca4e37d6f5c4f63aaa22acfa0bdd395747471 commit bd698440c4f488b89af2a2352579d19e9d92eb5d Author: Samuel Mehrbrodt Date: Fri Jun 16 15:30:30 2017 +0200 gpg4libre: Having this dllpublic should be fine now since it's in inc/ Change-Id: I79c132e717a62c6274eeafe33d732616cbd6a5a6 commit 6d6ddbb48b13a96d9e39f6096867a1b0ef69411b Author: Samuel Mehrbrodt Date: Fri Jun 16 15:24:06 2017 +0200 gpg4libre: Make signature dialog work with two signing services Change-Id: I0b47e6dba38222bb6b4f778c4206d3b37bc93089 commit e92a3b85a8a87743e3ed2abf85bad0202e128ab3 Author: Thorsten Behrens Date: Tue May 30 02:40:04 2017 +0200 gpg4libre: hacked to work Change-Id: Ic998ddb2aa791b2b0430f12280b1c1dc36a013d2 commit fe4dc3e8c2f2496fd6ff0380c4e5760a847d1a8c Author: Thorsten Behrens Date: Wed May 24 07:03:23 2017 +0200 gpg4libre: initial GPG signature validation Change-Id: I80afd77f74a6cb3f3fb7da03a6a4b74b132360d2 commit 61942d38fc4331ea3d31eab98361ff995178830c Author: Thorsten Behrens Date: Tue May 23 23:08:02 2017 +0200 gpg4libre: fix gpg signature generation Change-Id: I6eb95c948b6c8c9b8dee21215b430921bf454bb9 commit a846cb433882826a681c41d9ec99cf6e60d3397e Author: Thorsten Behrens Date: Sun May 21 14:28:57 2017 +0200 gpg4libre: share static xmlsec lib between nss and gpg In the end, the gpgme implementation uses enough of xmlsec functionality that splitting those (and ending up with two copies) was just not worth it. Change-Id: Ida87c848e4e6a770e3c697add9ceb589a9ec3930 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py
msodumper/docrecord.py | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 066645f49dbe22c893c8a176a7c97fe251ccff54
Author: Michael Stahl
Date: Wed Jun 21 18:03:12 2017 +0200
docrecord: fix reading of PChgTabsAdd, PChgTabsDel, PChgTabsDelClose
These did not read all of their content so anything following them was
messed up and possibly throwing exceptions.
This broke the test_abi1157 since commit
cc08c9db559ed7ac2bcb2d069fba62e9b2b8403a - before that, these were
simply not read from this particular file at all since they happen
to occur only in the 2nd half of FKPs.
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index c298ceb..d3ba5c1 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -597,8 +597,8 @@ class PChgTabsDel(BinaryStream):
def dump(self):
print '' % self.pos
self.printAndSet("cTabs", self.readuInt8())
-if self.cTabs != 0:
-print ''
+for i in range(self.cTabs):
+print '' % (i, self.readInt16())
print ''
self.parent.pos = self.pos
@@ -613,8 +613,10 @@ class PChgTabsDelClose(BinaryStream):
def dump(self):
print '' %
self.pos
self.printAndSet("cTabs", self.readuInt8())
-if self.cTabs != 0:
-print ''
+for i in range(self.cTabs):
+print '' % (i, self.readInt16())
+for i in range(self.cTabs):
+print '' % (i, self.readInt16())
print ''
self.parent.pos = self.pos
@@ -630,7 +632,9 @@ class PChgTabsAdd(BinaryStream):
print '' % self.pos
self.printAndSet("cTabs", self.readuInt8())
for i in range(self.cTabs):
-print '' % (i, self.readuInt16())
+print '' % (i, self.readInt16())
+for i in range(self.cTabs):
+print '' % (i, self.readuInt8())
print ''
self.parent.pos = self.pos
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0fed0829a601aaed6134bbc689b394e38c830605
Author: Eike Rathke
Date: Wed Jun 21 17:45:46 2017 +0200
Assert that nTabNo fits maTabData, tdf#108654 related
Change-Id: I30b95f69a71317896d86e36b1b926c703f1539d1
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index ceffc1973dca..a82fbd678914 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -502,6 +502,7 @@ ScViewData::~ScViewData() COVERITY_NOEXCEPT_FALSE
void ScViewData::UpdateCurrentTab()
{
+assert(0 <= nTabNo && static_cast(nTabNo) < maTabData.size());
pThisTab = maTabData[nTabNo];
while (!pThisTab)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 87cbbdc98d78c3c15f7161de6fec93d8680ee1de
Author: Eike Rathke
Date: Wed Jun 21 17:42:42 2017 +0200
Resolves: tdf#108654 check nTabNo against maTabData size
ScViewData::DeleteTab() and DeleteTabs() never did that and worked by
accident
for which commit 73dec49802ef8fc42c5719efaa42a33cde68e569 removed the
grounding..
Change-Id: I95460cd017d558c073df7891551d0251009dc1d4
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 63257497cb7c..ceffc1973dca 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -545,6 +545,11 @@ void ScViewData::DeleteTab( SCTAB nTab )
delete maTabData.at(nTab);
maTabData.erase(maTabData.begin() + nTab);
+if (static_cast(nTabNo) >= maTabData.size())
+{
+EnsureTabDataSize(1);
+nTabNo = maTabData.size() - 1;
+}
UpdateCurrentTab();
mpMarkData->DeleteTab( nTab );
}
@@ -558,6 +563,11 @@ void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
}
maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+ nTab+nSheets);
+if (static_cast(nTabNo) >= maTabData.size())
+{
+EnsureTabDataSize(1);
+nTabNo = maTabData.size() - 1;
+}
UpdateCurrentTab();
}
___
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/extras/sccellcursorobj.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7382bfda2b2c7b4382aec072c6134a2c0d5cd6c6
Author: Stephan Bergmann
Date: Wed Jun 21 17:21:14 2017 +0200
loplugin:privatebase
Change-Id: I4ccc29493332af16d9d79adff56002757b9d5bb6
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index eedec6e58a97..ade41a77e375 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -21,7 +21,7 @@ namespace sc_apitest {
#define NUMBER_OF_TESTS 2
-class ScCellCursorObj : public CalcUnoApiTest, apitest::XCellSeries
+class ScCellCursorObj : public CalcUnoApiTest, private apitest::XCellSeries
{
public:
ScCellCursorObj();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/writerhelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 05e82f9e97d7f44e5eeec68b9d9bc42124624d33
Author: Caolán McNamara
Date: Wed Jun 21 16:06:03 2017 +0100
ofz#2340 null deferences on close redlines
Change-Id: I5e270f160f51b7ffa7059dfd17f31d8ec5919a3e
diff --git a/sw/source/filter/ww8/writerhelper.cxx
b/sw/source/filter/ww8/writerhelper.cxx
index 0737ec419497..c12f5ef6817a 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -754,8 +754,8 @@ namespace sw
nIndex - 1);
sw::mark::IFieldmark *const pFieldMark(
rPos.GetDoc()->getIDocumentMarkAccess()->getFieldmarkFor(end));
-assert(pFieldMark);
-if (pFieldMark->GetMarkPos().nNode.GetIndex() ==
(*aResult)->m_aMkPos.m_nNode.GetIndex()+1
+SAL_WARN_IF(!pFieldMark, "sw.ww8", "expected a field
mark");
+if (pFieldMark &&
pFieldMark->GetMarkPos().nNode.GetIndex() ==
(*aResult)->m_aMkPos.m_nNode.GetIndex()+1
&& pFieldMark->GetMarkPos().nContent.GetIndex() <
(*aResult)->m_aMkPos.m_nContent)
{
(*aResult)->SetEndPos(end);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py
msodumper/docrecord.py | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 4ffce41ef44ad925ce0abce2832542c79b0d866c
Author: Miklos Vajna
Date: Wed Jun 21 16:44:45 2017 +0200
docrecord: dump line spacing structure
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 471a8cf..c298ceb 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -635,6 +635,19 @@ class PChgTabsAdd(BinaryStream):
self.parent.pos = self.pos
+class LSPD(BinaryStream):
+"""Specifies the spacing between lines in a paragraph."""
+def __init__(self, parent):
+BinaryStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+
+def dump(self):
+print '' % self.pos
+self.printAndSet("dyaLine", self.readuInt16())
+self.printAndSet("fMultLinespace", self.readuInt16())
+print ''
+
+
class PChgTabsPapxOperand(BinaryStream):
"""The PChgTabsPapxOperand structure is used by sprmPChgTabsPapx to
specify custom tab stops to be added or ignored."""
def __init__(self, parent):
@@ -1559,6 +1572,8 @@ class Sprm(BinaryStream):
dataStream = mainStream.doc.getDirectoryStreamByName("Data")
dataStream.pos = self.operand
self.ct = PrcData(dataStream)
+elif self.sprm == 0x6412:
+self.ct = LSPD(self)
elif self.getOperandSize() == 7:
self.operand = self.getuInt64() & 0x0fff
elif self.getOperandSize() == 9:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/labfmt.cxx |2 --
sw/source/ui/envelp/labfmt.hrc |4 +---
sw/source/ui/envelp/labfmt.hxx |2 --
sw/source/ui/envelp/labfmt.src |8
4 files changed, 1 insertion(+), 15 deletions(-)
New commits:
commit 2534ec3639c39384f0879488c235911ab2bef9b9
Author: Stephan Bergmann
Date: Wed Jun 21 16:39:30 2017 +0200
-Werror,-Wunused-private-field
Change-Id: I0f16c434f735ced976580e921394778559b57410
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 056c8531f0aa..aac47888dacd 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -109,8 +109,6 @@ SwLabPreview::SwLabPreview(vcl::Window* pParent)
, m_aUpperStr(SwResId(STR_UPPER))
, m_aColsStr(SwResId(STR_COLS))
, m_aRowsStr(SwResId(STR_ROWS))
-, m_aPWidthStr(SwResId(STR_PWIDTH))
-, m_aPHeightStr(SwResId(STR_PHEIGHT))
{
SetMapMode(MapUnit::MapPixel);
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index 128c179e4d32..2aa9340b41a0 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -32,12 +32,10 @@
#define STR_UPPER(RC_LABFMT_BEGIN + 6)
#define STR_COLS (RC_LABFMT_BEGIN + 7)
#define STR_ROWS (RC_LABFMT_BEGIN + 8)
-#define STR_PWIDTH (RC_LABFMT_BEGIN + 9)
-#define STR_PHEIGHT (RC_LABFMT_BEGIN + 10)
// overflow check
-#define LABFMT_ACT_END STR_PHEIGHT
+#define LABFMT_ACT_END STR_ROWS
#if LABFMT_ACT_END > RC_LABFMT_END
#error Resource overflow in #file, #line
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 37902090f96e..a54321d61640 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -37,8 +37,6 @@ class SwLabPreview : public vcl::Window
OUString m_aUpperStr;
OUString m_aColsStr;
OUString m_aRowsStr;
-OUString m_aPWidthStr;
-OUString m_aPHeightStr;
long m_lHDistWidth;
long m_lVDistWidth;
diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src
index 701248e0822a..d72efc34ab7c 100644
--- a/sw/source/ui/envelp/labfmt.src
+++ b/sw/source/ui/envelp/labfmt.src
@@ -52,12 +52,4 @@ String STR_ROWS
{
Text [ en-US ] = "Rows" ;
};
-String STR_PWIDTH
-{
-Text [ en-US ] = "Page Width" ;
-};
-String STR_PHEIGHT
-{
-Text [ en-US ] = "Page Height" ;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 11
+-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit eeb65fabd4c94e1ce69996890a4fb9badc11e778
Author: brainbreaker
Date: Thu Apr 27 19:06:43 2017 +0530
Listen for changes in editing preference settings
This commit gives the ability to listen for changes in
editing preference settings to LibreOfficeMainActivity.
This makes sure that value of mIsExperimentalMode
boolean is correct in any condition.
Change-Id: Ie2a931e63fad30262ad2f870b6c06f707db96618
Reviewed-on: https://gerrit.libreoffice.org/37033
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index b653c437c644..b4f8dc77f60b 100755
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -52,7 +52,7 @@ import java.util.List;
/**
* Main activity of the LibreOffice App. It is started in the UI thread.
*/
-public class LibreOfficeMainActivity extends AppCompatActivity {
+public class LibreOfficeMainActivity extends AppCompatActivity implements
SettingsListenerModel.OnSettingsPreferenceChangedListener {
private static final String LOGTAG = "LibreOfficeMainActivity";
private static final String DEFAULT_DOC_PATH = "/assets/example.odt";
@@ -109,6 +109,7 @@ public class LibreOfficeMainActivity extends
AppCompatActivity {
Log.w(LOGTAG, "onCreate..");
super.onCreate(savedInstanceState);
+SettingsListenerModel.getInstance().setListener(this);
SharedPreferences sPrefs =
PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
mIsExperimentalMode = sPrefs.getBoolean(ENABLE_EXPERIMENTAL_PREFS_KEY,
false);
@@ -667,6 +668,14 @@ public class LibreOfficeMainActivity extends
AppCompatActivity {
return !isDrawerOpen && !isDrawerLocked;
}
+@Override
+public void settingsPreferenceChanged(SharedPreferences sharedPreferences,
String key) {
+if (key.matches(ENABLE_EXPERIMENTAL_PREFS_KEY)) {
+Log.d(LOGTAG, "Editing Preference Changed");
+mIsExperimentalMode =
sharedPreferences.getBoolean(ENABLE_EXPERIMENTAL_PREFS_KEY, false);
+}
+}
+
private class DocumentPartClickListener implements
android.widget.AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView parent, View view, int
position, long id) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/unusedfields.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 77da7b934d782153be9271605691ceee6c66233a Author: Tor Lillqvist Date: Wed Jun 21 16:59:53 2017 +0300 Fix compilation with Clang 3.9.1 Change-Id: I6e96064a001fd511864665fe0ef8b60d45462c12 diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx index 66c99f48d281..1ba09f11e303 100644 --- a/compilerplugins/clang/unusedfields.cxx +++ b/compilerplugins/clang/unusedfields.cxx @@ -241,7 +241,7 @@ bool UnusedFields::VisitMemberExpr( const MemberExpr* memberExpr ) break; } if (isa(parent) || isa(parent) || isa(parent) || isa(parent) -#if CLANG_VERSION >= 30900 +#if CLANG_VERSION >= 4 || isa(parent) #endif || isa(parent)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/mmoutputtypepage.cxx |1 -
sw/source/ui/dbui/mmresultdialogs.cxx|1 -
sw/source/ui/envelp/label1.cxx |9 +++--
sw/source/ui/frmdlg/frmdlg.cxx |9 +++--
sw/source/ui/inc/mmresultdialogs.hxx |1 -
sw/source/uibase/dbui/dbmgr.cxx |2 --
sw/source/uibase/dbui/mmconfigitem.cxx |5 -
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |8
sw/source/uibase/docvw/AnchorOverlayObject.cxx |1 -
sw/source/uibase/docvw/AnchorOverlayObject.hxx |3 ---
sw/source/uibase/docvw/AnnotationWin2.cxx|2 --
sw/source/uibase/inc/frmdlg.hxx |3 ---
sw/source/uibase/inc/inputwin.hxx|1 -
sw/source/uibase/inc/label.hxx |3 ---
sw/source/uibase/inc/mmconfigitem.hxx| 10 --
sw/source/uibase/ribbar/inputwin.cxx |2 +-
16 files changed, 7 insertions(+), 54 deletions(-)
New commits:
commit 48da675a67a2bfd2eadfd6d4c6dba0dee74b5326
Author: Noel Grandin
Date: Wed Jun 21 11:31:56 2017 +0200
loplugin:unusedfields in sw part2
Change-Id: I7404fcac486f54fc0e310f401d8546c4aacfede2
Reviewed-on: https://gerrit.libreoffice.org/39040
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx
b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 6b5444843967..03eaa93efb4b 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -269,7 +269,6 @@ SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent,
SwMailMergeConfigItem&
m_pStatus = VclPtr::Create(*m_pContainer);
m_pStatusHB = &(m_pStatus->GetTheHeaderBar());
-m_nStatusHeight = m_pContainer->get_height_request();
OUString sTask(SwResId(ST_TASK));
OUString sStatus(SwResId(ST_STATUS));
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 186dc925e263..3a1f5b09870d 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -822,7 +822,6 @@ IMPL_LINK(SwMMResultPrintDialog, PrintHdl_Impl, Button*,
pButton, void)
if(nEnd > documentCount)
nEnd = documentCount;
}
-xConfigItem->SetPrintRange((sal_uInt16)nBegin, (sal_uInt16)nEnd);
OUString
sPages(OUString::number(documentStartPageNumber(xConfigItem.get(), nBegin)));
sPages += " - ";
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 31cf6911d9c8..eee6e2302ddb 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -99,16 +99,13 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet&
rSet,
, aTypeIds(50, 10)
, m_pRecs(new SwLabRecs)
, m_bLabel(bLabel)
-, m_nFormatId(0)
, m_nOptionsId(0)
, m_nLabelId(0)
, m_nCardsId(0)
-, m_nBusinessId(0)
-, m_nPrivateId(0)
{
WaitObject aWait( pParent );
-m_nFormatId = AddTabPage("format", SwLabFormatPage::Create, nullptr);
+AddTabPage("format", SwLabFormatPage::Create, nullptr);
m_nOptionsId = AddTabPage("options", SwLabPrtPage::Create, nullptr);
m_nCardsId = AddTabPage("cards", SwVisitingCardPage::Create, nullptr);
m_sBusinessCardDlg = GetPageText(m_nCardsId);
@@ -126,8 +123,8 @@ SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet&
rSet,
RemoveTabPage("labels");
RemoveTabPage("cards");
m_nLabelId = AddTabPage("medium", SwLabPage::Create, nullptr);
-m_nBusinessId = AddTabPage("business", SwBusinessDataPage::Create,
nullptr );
-m_nPrivateId = AddTabPage("private", SwPrivateDataPage::Create,
nullptr);
+AddTabPage("business", SwBusinessDataPage::Create, nullptr );
+AddTabPage("private", SwPrivateDataPage::Create, nullptr);
SetText(m_sBusinessCardDlg);
}
// Read user label from writer.cfg
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 5294a92f3e5a..19d81ef64a44 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -64,9 +64,6 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame,
, m_nStdId(0)
, m_nAddId(0)
, m_nWrapId(0)
-, m_nUrlId(0)
-, m_nPictureId(0)
-, m_nCropId(0)
, m_nColumnId(0)
//, m_nBackgroundId(0)
, m_nAreaId(0)
@@ -87,11 +84,11 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame* pViewFrame,
m_nStdId = AddTabPage("type", SwFramePage::Create, nullptr);
m_nAddId = AddTabPage("options", SwFrameAddPage::Create, nullptr);
m_nWrapId = AddTabPage("wrap", SwWrapTabPage::Create, nullptr);
-m_nUrlId = AddTabPage("hyperlink", SwFrameURLPage::Create, nullptr);
+AddTabPage("hyperlink", SwFrameURLPage::Create, nullptr);
if (m_sDlgType == "PictureDialog")
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx|1 -
sw/inc/format.hxx|1 -
sw/inc/hints.hxx |1 -
sw/inc/ndtxt.hxx |3 ---
sw/inc/node.hxx |3 ---
sw/inc/splargs.hxx |3 ---
sw/inc/swtable.hxx | 10 --
sw/inc/view.hxx |5 +
sw/source/core/attr/format.cxx |8 +++-
sw/source/core/attr/hints.cxx|2 +-
sw/source/core/crsr/crsrsh.cxx |3 ---
sw/source/core/docnode/node.cxx |3 ---
sw/source/core/edit/autofmt.cxx |1 -
sw/source/core/table/swtable.cxx |3 +--
sw/source/core/text/txthyph.cxx |4
sw/source/core/txtnode/atrfld.cxx|1 -
sw/source/core/txtnode/ndtxt.cxx |3 ---
sw/source/core/txtnode/txtatr2.cxx |3 ---
sw/source/core/txtnode/txtedt.cxx|2 --
sw/source/uibase/docvw/PostItMgr.cxx |2 --
sw/source/uibase/uiview/view.cxx |1 -
sw/source/uibase/uiview/view2.cxx|5 -
22 files changed, 6 insertions(+), 62 deletions(-)
New commits:
commit 9b68ce7b0f2326ec540717ec5c8207825403774e
Author: Noel Grandin
Date: Wed Jun 21 12:25:20 2017 +0200
loplugin:unusedfields in sw part5
Change-Id: I4111ed1dcb04e010ecfb93df3a7e7bf715abf585
Reviewed-on: https://gerrit.libreoffice.org/39044
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 24e5b4ea3672..89ad4b249376 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -194,7 +194,6 @@ private:
sal_uLong m_nAktNode; // save CursorPos at Start-Action
sal_Int32 m_nAktContent;
SwNodeType m_nAktNdTyp;
-bool m_bAktSelection;
/*
* Via the Method SttCursorMove and EndCursorMove this counter gets
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index ad7fdac8836c..42bddf7b44bc 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -53,7 +53,6 @@ class SW_DLLPUBLIC SwFormat : public SwModify
(is not hard attribution!!!) */
sal_uInt16 m_nPoolHelpId; ///< HelpId for this Pool-style.
sal_uInt8 m_nPoolHlpFileId; ///< FilePos to Doc to these style helps.
-bool m_bWritten : 1; ///< TRUE: already written.
bool m_bAutoFormat : 1; /**< FALSE: it is a template.
default is true! */
bool m_bFormatInDTOR : 1;/**< TRUE: Format becomes deleted. In order
to be able
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index ce7c6444e11c..1e5049bf8a0a 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -181,7 +181,6 @@ public:
class SwAutoFormatGetDocNode: public SwMsgPoolItem
{
public:
-const SwContentNode* pContentNode;
const SwNodes* pNodes;
SwAutoFormatGetDocNode( const SwNodes* pNds );
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 6a4b563a519c..c3c08e240652 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -108,9 +108,6 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public
::sfx2::Metadatable
Needed to avoid duplicate handling of attribute change actions. */
bool mbInSetOrResetAttr;
-/// pointer to the list, to whose the text node is added to
-SwList* mpList;
-
std::unique_ptr< OUString > m_pNumStringCache;
css::uno::WeakReference m_wXParagraph;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 83fbbd2da269..89c6f7f10a94 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -85,7 +85,6 @@ class SW_DLLPUBLIC SwNode
/// For text nodes: level of auto format. Was put here because we had
still free bits.
sal_uInt8 m_nAFormatNumLvl : 3;
-bool m_bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
bool m_bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the
flag
#ifdef DBG_UTIL
@@ -128,8 +127,6 @@ public:
sal_uInt8 GetAutoFormatLvl() const { return m_nAFormatNumLvl; }
void SetAutoFormatLvl( sal_uInt8 nVal ) { m_nAFormatNumLvl = nVal; }
-void SetNumLSpace( bool bFlag ){ m_bSetNumLSpace = bFlag; }
-
bool IsIgnoreDontExpand() const { return m_bIgnoreDontExpand; }
void SetIgnoreDontExpand( bool bNew ) { m_bIgnoreDontExpand = bNew; }
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 85ae6b45c2b1..bf61b5909a5e 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -113,7 +113,6 @@ class SwInterHyphInfo
{
css::uno::Reference< css::linguistic2::XHyphenatedWord >xHyphWord;
const Point aCursorPos;
-bool bNoLang : 1;
bool bCheck : 1;
public:
sal_Int32 nStart;
@@ -123,7 +122,6 @@ public:
SwInterHyphInfo( const Point &rCursorPos )
: aCursorPos(rCursorPos)
-, bNoLang(false)
, bCheck(false)
, nStart(0)
, nEnd(SAL_MAX_INT32)
@@ -140,7 +138,6 @@ public:
}
bool IsCheck() const { re
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/css1atr.cxx |3 ---
sw/source/filter/html/htmlbas.cxx |5 -
sw/source/filter/html/htmltabw.cxx |3 ---
sw/source/filter/html/svxcss1.cxx |3 ---
sw/source/filter/html/svxcss1.hxx |1 -
sw/source/filter/html/swhtml.cxx |1 -
sw/source/filter/html/swhtml.hxx |1 -
sw/source/filter/html/wrthtml.cxx |2 --
sw/source/filter/html/wrthtml.hxx |1 -
sw/source/filter/inc/wrtswtbl.hxx |3 ---
sw/source/filter/writer/wrtswtbl.cxx |2 +-
sw/source/ui/dbui/mmoutputtypepage.cxx | 17 -
sw/source/ui/dbui/mmresultdialogs.cxx |3 +--
sw/source/ui/envelp/labfmt.cxx |2 --
sw/source/ui/envelp/labfmt.hxx |2 --
sw/source/ui/inc/mmresultdialogs.hxx |3 +--
16 files changed, 7 insertions(+), 45 deletions(-)
New commits:
commit d2e4aeb929b346acd0d1a2eaeee7237b89b99474
Author: Noel Grandin
Date: Wed Jun 21 11:41:27 2017 +0200
loplugin:unusedfields in sw part3
Change-Id: I0ee93f4df757d477912de70937ec1dded82c48fb
Reviewed-on: https://gerrit.libreoffice.org/39041
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 1c020e270922..fc83c2a1326a 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1604,9 +1604,6 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const
SwFormat& rFormat,
bHasScriptDependencies = true;
}
-if( nPoolFormatId==RES_POOLCOLL_TEXT && !rHTMLWrt.m_bFirstCSS1Property )
-rHTMLWrt.m_bPoolCollTextModified = true;
-
// export Drop-Caps
const SfxPoolItem *pItem;
if( SfxItemState::SET==aItemSet.GetItemState( RES_PARATR_DROP, false,
&pItem ))
diff --git a/sw/source/filter/html/htmlbas.cxx
b/sw/source/filter/html/htmlbas.cxx
index 2626291fb236..372ee9be7078 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -223,11 +223,6 @@ void SwHTMLParser::AddScriptSource()
{
m_aScriptSource += "\n";
}
-else
-{
-// We're behind the CR/LF of the line before
-m_nScriptStartLineNr = GetLineNr() - 1;
-}
m_aScriptSource += aToken;
}
}
diff --git a/sw/source/filter/html/htmltabw.cxx
b/sw/source/filter/html/htmltabw.cxx
index 60a71acc2e2a..d159d5d806f6 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -262,7 +262,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
if ( !nRowSpan )
return;
-SwWriteTableCol *pCol = m_aCols[nCol];
bool bOutWidth = true;
const SwStartNode* pSttNd = pBox->GetSttNd();
@@ -374,8 +373,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
sOut.append(static_cast(aPixelSz.Width()));
}
sOut.append("\"");
-if( !m_bLayoutExport && nColSpan==1 )
-pCol->SetOutWidth( false );
}
if( nHeight )
diff --git a/sw/source/filter/html/svxcss1.cxx
b/sw/source/filter/html/svxcss1.cxx
index 6c2c1d1d1fbc..e87fb3ad6adf 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -722,7 +722,6 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const
OUString& rBaseURL,
sBaseURL( rBaseURL ),
pSheetItemSet(nullptr),
pItemSet(nullptr),
-pSearchEntry( nullptr ),
pPropInfo( nullptr ),
nMinFixLineSpace( MM50/2 ),
eDfltEnc( RTL_TEXTENCODING_DONTKNOW ),
@@ -774,14 +773,12 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const
OUString& rBaseURL,
pSheetItemSet = new SfxItemSet( rPool, &aWhichMap[0] );
pSheetPropInfo = new SvxCSS1PropertyInfo;
-pSearchEntry = new SvxCSS1MapEntry( rPool, &aWhichMap[0] );
}
SvxCSS1Parser::~SvxCSS1Parser()
{
delete pSheetItemSet;
delete pSheetPropInfo;
-delete pSearchEntry;
}
void SvxCSS1Parser::InsertId( const OUString& rId,
diff --git a/sw/source/filter/html/svxcss1.hxx
b/sw/source/filter/html/svxcss1.hxx
index d212362f0d33..5acb446ad586 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -196,7 +196,6 @@ class SvxCSS1Parser : public CSS1Parser
SfxItemSet *pSheetItemSet; // item set of Style-Sheet
SfxItemSet *pItemSet; // current item set
-SvxCSS1MapEntry *pSearchEntry;
SvxCSS1PropertyInfo *pSheetPropInfo;
SvxCSS1PropertyInfo *pPropInfo;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7b3a4a0c8d85..083d2a2ab07d 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -259,7 +259,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor,
SvStream& rIn,
m_pImageMap( nullptr ),
m_pImageMaps(nullptr),
m_pFootEndNoteImpl( nullptr ),
-m_nScriptStartLineNr( 0 ),
m_nBaseFontStMin( 0 ),
m_nFontSt
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/gdb-core-bt.sh | 37 -
1 file changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 08792a4b332d907c72d1fc7301133f5b306ec8dd
Author: Stephan Bergmann
Date: Wed Jun 21 14:51:49 2017 +0200
Process all core files that are found
...which can be useful e.g. when a UITest spawned multiple soffice.bin sub-
processes that crashed
Change-Id: Ic14ab286b320f2ee548c217e5395cfeec3afa889
diff --git a/solenv/bin/gdb-core-bt.sh b/solenv/bin/gdb-core-bt.sh
index a24390dace2c..45b612128e6f 100755
--- a/solenv/bin/gdb-core-bt.sh
+++ b/solenv/bin/gdb-core-bt.sh
@@ -15,23 +15,26 @@ EXITCODE=${3}
if test -n "$(which gdb)"
then
-if test "$(find "$COREDIR" -name "core*" | wc -l)" -eq 1
-then
-COREFILE=$(ls "$COREDIR"/core*)
-echo
-echo "It looks like ${EXECUTABLE} generated a core file at ${COREFILE}"
-echo "Backtraces:"
-GDBCOMMANDFILE=$(mktemp)
-printf "info registers\nthread apply all backtrace full\n" >
"$GDBCOMMANDFILE"
-guess=$(file "$COREFILE")
-guess=${guess#* execfn: \'}
-guess=${guess%%\'*}
-if [ -x "$guess" ]; then EXECUTABLE=$guess; fi
-gdb -x "$GDBCOMMANDFILE" --batch "$EXECUTABLE" "$COREFILE"
-rm "$GDBCOMMANDFILE"
-echo
-exit 0
-elif [ "$EXITCODE" -ge 128 ]; then
+found=
+for COREFILE in "$COREDIR"/core*
+do
+if [ -f "$COREFILE" ]
+then
+printf '\nIt looks like %s generated %s\nBacktraces:\n' \
+"$EXECUTABLE" "$COREFILE"
+GDBCOMMANDFILE=$(mktemp)
+printf "info registers\nthread apply all backtrace full\n" \
+>"$GDBCOMMANDFILE"
+guess=$(file "$COREFILE")
+guess=${guess#* execfn: \'}
+guess=${guess%%\'*}
+if [ ! -x "$guess" ]; then guess=$EXECUTABLE; fi
+gdb -x "$GDBCOMMANDFILE" --batch "$guess" "$COREFILE" && found=x
+rm "$GDBCOMMANDFILE"
+echo
+fi
+done
+if [ -z "$found" -a "$EXITCODE" -ge 128 ]; then
echo
echo "No core file identified in directory ${COREDIR}"
echo "To show backtraces for crashes during test execution,"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/emfplusprimitiveparser' - drawinglayer/inc drawinglayer/source
drawinglayer/inc/emfplushelper.hxx |9
drawinglayer/source/tools/emfpbrush.cxx |4
drawinglayer/source/tools/emfphelperdata.cxx | 439 ++-
drawinglayer/source/tools/emfphelperdata.hxx | 294 --
drawinglayer/source/tools/emfplushelper.cxx | 12
drawinglayer/source/tools/emfppen.cxx|6
drawinglayer/source/tools/emfppen.hxx|2
drawinglayer/source/tools/wmfemfhelper.cxx |8
8 files changed, 396 insertions(+), 378 deletions(-)
New commits:
commit 24f85273cbcbc272e9419366cbd942ba154a3918
Author: Armin Le Grand
Date: Wed Jun 21 14:46:35 2017 +0200
emfplus: some cleanup/streamlining
Change-Id: Ia931ca356fb079b9cb2395ba2311b91d2481e2d4
diff --git a/drawinglayer/inc/emfplushelper.hxx
b/drawinglayer/inc/emfplushelper.hxx
index 1a685a631abd..839a94d82e95 100644
--- a/drawinglayer/inc/emfplushelper.hxx
+++ b/drawinglayer/inc/emfplushelper.hxx
@@ -33,16 +33,17 @@ namespace emfplushelper
class EmfPlusHelper
{
private:
-EmfPlusHelperData* mpD;
+const std::unique_ptr mpD;
public:
-EmfPlusHelper(SvMemoryStream& rMemoryStream);
+EmfPlusHelper(
+SvMemoryStream& rMemoryStream,
+wmfemfhelper::TargetHolders& rTargetHolders,
+wmfemfhelper::PropertyHolders& rPropertyHolders);
~EmfPlusHelper();
void processEmfPlusData(
SvMemoryStream& rMemoryStream,
-wmfemfhelper::TargetHolders& rTargetHolders,
-wmfemfhelper::PropertyHolders& rPropertyHolders,
const drawinglayer::geometry::ViewInformation2D& rViewInformation);
};
}
diff --git a/drawinglayer/source/tools/emfpbrush.cxx
b/drawinglayer/source/tools/emfpbrush.cxx
index d552bdfd5cd4..c093a5682572 100644
--- a/drawinglayer/source/tools/emfpbrush.cxx
+++ b/drawinglayer/source/tools/emfpbrush.cxx
@@ -200,7 +200,7 @@ namespace emfplushelper
if (additionalFlags & 0x02) {
SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation");
-readXForm(s, brush_transformation);
+rR.readXForm(s, brush_transformation);
hasTransformation = true;
SAL_INFO("cppcanvas.emf",
"EMF+\tm11: " << brush_transformation.get(0,0) <<
" m12: " << brush_transformation.get(1,0) <<
@@ -273,7 +273,7 @@ namespace emfplushelper
if (additionalFlags & 0x02) {
SAL_INFO("cppcanvas.emf", "EMF+\tuse transformation");
-readXForm(s, brush_transformation);
+rR.readXForm(s, brush_transformation);
hasTransformation = true;
SAL_INFO("cppcanvas.emf",
"EMF+\tm11: " << brush_transformation.get(0,0) << " m12: "
<< brush_transformation.get(1,0) <<
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index cbce6d32efb0..fcab2bbd7a44 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -80,78 +80,43 @@ namespace emfplushelper
{
}
-bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget)
-{
-rTarget.identity();
-
-if (sizeof(float) != 4)
-{
-OSL_FAIL("EnhWMFReader::sizeof( float ) != 4");
-return false;
-}
-else
-{
-float eM11(0.0);
-float eM12(0.0);
-float eM21(0.0);
-float eM22(0.0);
-float eDx(0.0);
-float eDy(0.0);
-#ifdef OSL_BIGENDIAN
-eM11 = GetSwapFloat(rIn);
-eM12 = GetSwapFloat(rIn);
-eM21 = GetSwapFloat(rIn);
-eM22 = GetSwapFloat(rIn);
-eDx = GetSwapFloat(rIn);
-eDy = GetSwapFloat(rIn);
-#else
-
rIn.ReadFloat(eM11).ReadFloat(eM12).ReadFloat(eM21).ReadFloat(eM22).ReadFloat(eDx).ReadFloat(eDy);
-#endif
-rTarget = basegfx::B2DHomMatrix(
-eM11, eM21, eDx,
-eM12, eM22, eDy);
-}
-
-return true;
-}
-
-OutDevState::OutDevState() :
-clip(),
-clipRect(),
-xClipPoly(),
-
-lineColor(),
-fillColor(),
-textColor(),
-textFillColor(),
-textLineColor(),
-
-xFont(),
-transform(),
-mapModeTransform(),
-fontRotation(0.0),
-
-textEmphasisMarkStyle(FontEmphasisMark::NONE),
-pushFlags(PushFlags::ALL),
-textDirection(css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
-textAlignment(0), // TODO(Q2): Synchronize with implrenderer
-// and possibly new rendering::TextAlignment
-textReliefStyle(FontRelief::NONE),
-textOverlineStyle(LINESTYLE_NONE),
-textUnderlineStyle(LINESTYLE_NONE),
-textStrikeoutStyle(STRIKEOUT_NONE),
-
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/bindings.hxx |1 -
include/sfx2/frmdescr.hxx |1 -
sfx2/source/appl/newhelp.cxx |1 -
sfx2/source/appl/newhelp.hxx |1 -
sfx2/source/appl/workwin.cxx |7 +++
sfx2/source/bastyp/frmhtml.cxx | 11 ---
sfx2/source/bastyp/progress.cxx|6 --
sfx2/source/control/bindings.cxx | 33 -
sfx2/source/control/dispatch.cxx | 14 --
sfx2/source/dialog/backingwindow.cxx | 18 +-
sfx2/source/dialog/backingwindow.hxx |1 -
sfx2/source/dialog/dockwin.cxx | 14 +-
sfx2/source/dialog/filedlghelper.cxx |2 --
sfx2/source/dialog/filedlgimpl.hxx |2 --
sfx2/source/dialog/splitwin.cxx| 23 +++
sfx2/source/doc/frmdescr.cxx |8 +---
sfx2/source/doc/objmisc.cxx|1 -
sfx2/source/doc/objstor.cxx|2 --
sfx2/source/doc/objxtor.cxx| 15 +--
sfx2/source/inc/objshimp.hxx |5 +
sfx2/source/inc/splitwin.hxx |3 ---
sfx2/source/inc/workwin.hxx|5 ++---
sfx2/source/toolbox/tbxitem.cxx|4
sfx2/source/view/frame.cxx |5 -
sfx2/source/view/impviewframe.hxx |2 --
sfx2/source/view/sfxbasecontroller.cxx |9 -
sfx2/source/view/viewfrm2.cxx | 16 ++--
27 files changed, 27 insertions(+), 183 deletions(-)
New commits:
commit d7824bf16898d8cb776420e0c2bff82e6df61b86
Author: Noel Grandin
Date: Wed Jun 21 11:07:15 2017 +0200
loplugin:unusedfields in sfx2 part2
Change-Id: I227b643641250d47ac6b2218f57ddb231765960e
Reviewed-on: https://gerrit.libreoffice.org/39038
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 819897b97ffc..d34f2ff0931a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -122,7 +122,6 @@ public:
virtual ~SfxBindings() override;
void HidePopups( bool bHide = true );
-SAL_DLLPRIVATE void HidePopupCtrls_Impl( bool bHide = true );
void SetDispatcher(SfxDispatcher *pDisp);
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 1e6e49e54215..eab02e3b3f62 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -79,7 +79,6 @@ public:
{ return aURL; }
voidSetURL( const OUString& rURL );
voidSetActualURL( const OUString& rURL );
-voidSetEditable( bool bSet );
// Size
voidSetResizable( bool bRes )
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 96e54561145c..d9ef75019f07 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1436,7 +1436,6 @@
SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl(SfxHelpWindow_Impl* _pParent)
m_pTabCtrl->SetCurPageId( (sal_uInt16)nPageId );
ActivatePageHdl( m_pTabCtrl );
m_pActiveLB->SetSelectHdl( LINK( this, SfxHelpIndexWindow_Impl, SelectHdl
) );
-nMinWidth = ( m_pActiveLB->GetSizePixel().Width() / 2 );
aIdle.SetInvokeHandler( LINK( this, SfxHelpIndexWindow_Impl, InitHdl ) );
aIdle.SetPriority( TaskPriority::LOWER );
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index e6cb4b7aa93a..c9ee6c2df7e2 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -298,7 +298,6 @@ private:
VclPtr pSPage;
VclPtr pBPage;
-longnMinWidth;
boolbWasCursorLeftOrRight;
boolbIsInitDone;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index a07b1daa8b73..8e662c6f44b2 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -861,7 +861,7 @@ bool SfxWorkWindow::PrepareClose_Impl()
SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow,
-SfxChildAlignment eAlign, bool bCanGetFocus )
+SfxChildAlignment eAlign )
{
DBG_ASSERT( aChildren.size() < 255, "too many children" );
DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" );
@@ -873,7 +873,6 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl(
vcl::Window& rWindow,
SfxChild_Impl *pChild = new SfxChild_Impl(rWindow, rWindow.GetSizePixel(),
eAlign, rWindow.IsVisible());
-pChild->bCanGetFocus = bCanGetFocus;
aChildren.push_back(pChild);
bSorted = false;
@@ -1375,7 +1374,7 @@ void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl
*pCW, bool bSetFocus )
{
// The window is not docked or docked outside of one split windows
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/view.hxx |4 +--
sw/source/ui/dbui/mmresultdialogs.cxx |2 -
sw/source/ui/fmtui/tmpdlg.cxx | 32 --
sw/source/ui/index/cnttab.cxx |2 -
sw/source/uibase/app/apphdl.cxx |6 ++---
sw/source/uibase/inc/SwXFilterOptions.hxx |1
sw/source/uibase/inc/navipi.hxx |1
sw/source/uibase/inc/swuicnttab.hxx |1
sw/source/uibase/inc/tmpdlg.hxx |8 ---
sw/source/uibase/inc/uivwimp.hxx |4 ---
sw/source/uibase/uiview/uivwimp.cxx |1
sw/source/uibase/uiview/view0.cxx |5 +---
sw/source/uibase/uno/SwXFilterOptions.cxx |5
sw/source/uibase/utlui/navipi.cxx |3 --
14 files changed, 20 insertions(+), 55 deletions(-)
New commits:
commit f05d0d05829dd51cb9d8071ac97cc219779ee40a
Author: Noel Grandin
Date: Wed Jun 21 11:23:46 2017 +0200
loplugin:unusedfields in sw part1
Change-Id: Iabbf7f09c0d92b488d7e03f4436f077c5e6e87aa
Reviewed-on: https://gerrit.libreoffice.org/39039
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 23136b765819..c47e078d79f7 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -607,9 +607,9 @@ public:
// store MailMerge data while "Back to Mail Merge Wizard" FloatingWindow
is active
// or to support printing
-void SetMailMergeConfigItem(std::shared_ptr&
rConfigItem, sal_uInt16 nRestart);
+void SetMailMergeConfigItem(std::shared_ptr&
rConfigItem);
std::shared_ptr GetMailMergeConfigItem() const;
-std::shared_ptr EnsureMailMergeConfigItem(const
SfxItemSet* pArgs = nullptr, sal_uInt16 nWizardRestartPage = 0);
+std::shared_ptr EnsureMailMergeConfigItem(const
SfxItemSet* pArgs = nullptr);
void ExecFormatPaintbrush(SfxRequest &);
void StateFormatPaintbrush(SfxItemSet &);
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 2004445fc7c9..2001a39ae300 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -828,7 +828,7 @@ IMPL_LINK(SwMMResultPrintDialog, PrintHdl_Impl, Button*,
pButton, void)
sPages += " - ";
sPages += OUString::number(documentEndPageNumber(xConfigItem.get(), nEnd -
1));
-pTargetView->SetMailMergeConfigItem(xConfigItem, 0);
+pTargetView->SetMailMergeConfigItem(xConfigItem);
if(m_pTempPrinter)
{
SfxPrinter *const pDocumentPrinter = pTargetView->GetWrtShell()
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index bb5fb940360d..a8b1eab8de77 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -83,15 +83,11 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
, bNewStyle(bNew)
, m_nIndentsId(0)
, m_nAlignId(0)
-, m_nTextFlowId(0)
-, m_nAsianTypo(0)
, m_nFontId(0)
, m_nFontEffectId(0)
, m_nPositionId(0)
, m_nAsianLayoutId(0)
-, m_nTabId(0)
, m_nOutlineId(0)
-, m_nDropCapsId(0)
, m_nBackgroundId(0)
, m_nAreaId(0)
, m_nTransparenceId(0)
@@ -105,12 +101,8 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
, m_nHeaderId(0)
, m_nFooterId(0)
, m_nPageId(0)
-, m_nFootNoteId(0)
-, m_nTextGridId(0)
-, m_nSingleId(0)
, m_nBulletId(0)
, m_nNumId(0)
-, m_nBmpId(0)
, m_nNumOptId(0)
, m_nNumPosId(0)
{
@@ -165,11 +157,11 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH),
"GetTabPageRangesFunc fail!");
-m_nTextFlowId = AddTabPage("textflow",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
+AddTabPage("textflow",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN),
"GetTabPageRangesFunc fail!");
-m_nAsianTypo = AddTabPage("asiantypo",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
+AddTabPage("asiantypo",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),
pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
OSL_ENSURE(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ),
"GetTabPageCreatorFunc fail!");
OSL_ENSURE(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ),
"GetTabPageRangesFunc fail!");
@@ -193,12 +185,10 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
GSoC update | Week 3 | LibreOffice online - Aditya Dewan
Hi everyone! I spent the last week mostly working on adding the 'follow editor' feature. As per the discussions, automatic assigning and switching of editors has been implemented in wsd only, and no changes in the lokit are being made for this. Most part of this is done and is working and the patch is currently under review. Regards, Aditya Dewan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 266bcae306a1dd6e0d9df80ba30ade7311385c28 Author: Jens Carl Date: Wed Jun 21 05:10:32 2017 + White-list sw/ Change-Id: Ic4ca1753720d3806cc0fa9f517078dd5032d9e20 Reviewed-on: https://gerrit.libreoffice.org/39029 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/bin/find-german-comments b/bin/find-german-comments index 6a3b3fb0de55..504ed0e2bcf1 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -339,7 +339,7 @@ class Parser: "svl" : 1, "svtools" : 1, "svx" : 1, -"sw" : 0, # +"sw" : 1, "test" : 1, "testtools" : 1, "toolkit" : 1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source
svx/source/styles/CommonStylePreviewRenderer.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 65afee1494ac1f71b39e4b3dc1ced52c5f21de54
Author: Caolán McNamara
Date: Tue Jun 20 11:44:47 2017 +0100
tdf#93968 bullet char style preview is unreadable, cause uses opensymbol
Change-Id: I1bd0a0e85c9d956184680d7e15709b3a7b590c30
Reviewed-on: https://gerrit.libreoffice.org/39010
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx
b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 45360ba89eb9..a1096c5e3e80 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -134,6 +134,8 @@ bool CommonStylePreviewRenderer::recalculate()
if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_FONT)) != nullptr)
{
const SvxFontItem* pFontItem = static_cast(pItem);
+if (IsStarSymbol(pFontItem->GetFamilyName()))
+return false;
pFont->SetFamilyName(pFontItem->GetFamilyName());
pFont->SetStyleName(pFontItem->GetStyleName());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 08316e5edfc36ed75a4e8dc5b6aa7eea3af4eea9 Author: Jens Carl Date: Tue Jun 20 18:37:47 2017 + tdf#39468 Translate German comments in sw/source/filter/ww8/ww8scan.cxx Change-Id: I30e673fc5741c37e3064e2b2035d772b43364d06 Reviewed-on: https://gerrit.libreoffice.org/39022 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 68b3870d83fc..30ff406b8ef3 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2177,13 +2177,13 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32 nPN, sal_Int32 ncpN) std::size_t nLastFkpPos = nPN + nIMax - 1; nLastFkpPos = nLastFkpPos << 9; -// Anz. Fkp-Eintraege des letzten Fkp +// number of FC entries of last Fkp if (!checkSeek(rSt, nLastFkpPos + 511)) break; sal_uInt8 nb(0); rSt.ReadUChar( nb ); -// letzer FC-Eintrag des letzten Fkp +// last FC entry of last Fkp if (!checkSeek(rSt, nLastFkpPos + nb * 4)) break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmlgrin.cxx |4 ++--
sw/source/filter/html/swhtml.cxx |2 +-
sw/source/filter/ww8/ww8graf2.cxx |2 +-
sw/source/filter/ww8/ww8par2.cxx |2 +-
sw/source/filter/ww8/ww8par3.cxx |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 136ce64b18283acf9db5d130f8ac9108591dd4ee
Author: Jens Carl
Date: Wed Jun 21 05:01:27 2017 +
tdf#39468 Translate German comments in sw/
Translate the last remnants found by ./bin/find-german-comments sw
Change-Id: I0618671b8794e05a51eeff811746a1154359d0fe
Reviewed-on: https://gerrit.libreoffice.org/39028
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/filter/html/htmlgrin.cxx
b/sw/source/filter/html/htmlgrin.cxx
index b9a0cf6e26b5..331db9f9c7dc 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1141,8 +1141,8 @@ ANCHOR_SETEVENT:
}
}
-// Sprungziele, die unseren ipmliziten Zielen entsprechen, schmeissen
-// wir hier ganz rigoros raus.
+// Jump targets, which match our implicit targets,
+// here we throw out rigorously.
if( !aName.isEmpty() )
{
OUString sDecoded( INetURLObject::decode( aName,
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index dbb4f7c26775..7b3a4a0c8d85 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -188,7 +188,7 @@ bool HTMLReader::SetStrmStgPtr()
}
-// Aufruf fuer die allg. Reader-Schnittstelle
+// Call for the general Reader-Interface
ErrCode HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam,
const OUString & rName )
{
if( !pStrm )
diff --git a/sw/source/filter/ww8/ww8graf2.cxx
b/sw/source/filter/ww8/ww8graf2.cxx
index d34c32ca003e..25934119c376 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -526,7 +526,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj*
pTextObj,
}
else if((0x64 == aPic.MFP.mm) || (0x66 == aPic.MFP.mm))
{
-// verlinkte Grafik im Escher-Objekt
+// linked graphic in ESCHER-Object
SdrObject* pObject = nullptr;
WW8PicDesc aPD( aPic );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index bd32af41ddae..76929b7303b0 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1110,7 +1110,7 @@ void SwWW8ImplReader::NextAnlLine(const sal_uInt8*
pSprm13)
// pNd->UpdateNum without a set of rules crashes at the latest whilst
storing as sdw3
-// WW:10 = numberierung -> SW:0 & WW:11 = bullets -> SW:0
+// WW:10 = numbering -> SW:0 & WW:11 = bullets -> SW:0
if (*pSprm13 == 10 || *pSprm13 == 11)
{
m_nSwNumLevel = 0;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 811923bbd77f..4e71a6daff6b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2030,7 +2030,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const
sal_uInt8* pData,
if (m_pAktColl && (m_nLFOPosition == 2047-1) && m_nAktColl <
m_vColl.size())
m_vColl[m_nAktColl].m_bHasBrokenWW6List = true;
-// die Streamdaten sind hier 1 basiert, wir ziehen EINS ab
+// here the stream data is 1-based, we substact ONE
if (USHRT_MAX > m_nLFOPosition)
{
if (m_nLFOPosition != 2047-1) //Normal ww8+ list behaviour
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8graf.cxx | 155 +++
1 file changed, 76 insertions(+), 79 deletions(-)
New commits:
commit b29bae1064c9f980cc50a667e8b96c5e370326d7
Author: Jens Carl
Date: Wed Jun 21 04:40:28 2017 +
tdf#39468 Translate German comments/terms in
sw/source/filter/ww8/ww8graf.cxx
Change-Id: I3cfc777be4b717bee7fd4559ca79fb9ba6626a51
Reviewed-on: https://gerrit.libreoffice.org/39027
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 74c6a920b2c9..82752a24f967 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -773,7 +773,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp,
WW8_CP& rEndCp,
return false;
}
-// ggfs. zuerst die richtige TextBox-Story finden
+// if applicable first find the right TextBox-Story
bool bCheckTextBoxStory = ( nTxBxS && pT->GetIMax() >= nTxBxS );
if( bCheckTextBoxStory )
pT->SetIdx( nTxBxS-1 );
@@ -864,7 +864,7 @@ sal_Int32
SwWW8ImplReader::GetRangeAsDrawingString(OUString& rString, long nStar
WW8_CP nOffset = 0;
m_pWwFib->GetBaseCp(eType, &nOffset); //TODO: check return value
-OSL_ENSURE(nStartCp <= nEndCp, "+Wo ist der Grafik-Text (7) ?");
+OSL_ENSURE(nStartCp <= nEndCp, "+where's the graphic text (7)?");
if (nStartCp == nEndCp)
rString.clear(); // empty string: entirely possible
else if (nStartCp < nEndCp)
@@ -1172,12 +1172,12 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj*
pTextObj,
pTextObj->NbcSetOutlinerParaObject( pOp );
pTextObj->SetVerticalWriting(bVertical);
-// Fuer die naechste Textbox noch die alten Absatz-Attribute
-// und Styles entfernen, sonst startet die naechste Box
-// mit falschen Attributen.
-// Vorgehen: Text loeschen = auf 1 Absatz reduzieren
-// und an diesem Absatz die Absatzattribute und Styles loeschen
-// (Empfehlung JOE)
+// For the next TextBox also remove the old paragraph attributes
+// and styles, otherwise the next box will start with the wrong
+// attributes.
+// Course of action: delete text = reduce to one paragraph
+// and on this one delete the paragraph attributes
+// and styles
m_pDrawEditEngine->SetText( OUString() );
m_pDrawEditEngine->SetParaAttribs(0,
m_pDrawEditEngine->GetEmptyItemSet());
}
@@ -1342,7 +1342,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short&
rLeft, SfxAllItemSet &rSet)
// This whole archaic word 6 graphic import can probably be refactored
// into an object hierarchy with a little effort.
SdrObject *pRet=nullptr;
-WW8_DPHEAD aHd; // Lese Draw-Primitive-Header
+WW8_DPHEAD aHd; // Read Draw-Primitive-Header
bool bCouldRead = checkRead(*m_pStrm, &aHd, sizeof(WW8_DPHEAD)) &&
SVBT16ToShort(aHd.cb) >= sizeof(WW8_DPHEAD);
OSL_ENSURE(bCouldRead, "Graphic Primitive header short read" );
@@ -1477,15 +1477,14 @@ sal_Int32
SwMSDffManager::GetEscherLineMatch(MSO_LineStyle eStyle,
{
sal_Int32 nOutsideThick = 0;
/*
-Beachte: im Gegensatz zu den Winword-ueblichen Tabellen- und
-Rahmen-Randbreiten-Angaben, bei denen jeweils aus der Staerke *einer*
-Linie die Gesamt-Randbreite zu errechnen ist, liegen die aus dem ESCHER
-stammenden Daten bereits als Gesamt-Breite [twips] vor!
-
-Der Winword default ist 15 tw. Wir nehmen hierfuer unsere 20 tw Linie. (
-0.75 pt uns 1.0 pt sehen sich auf dem Ausdruck naemlich aehnlicher als
-etwas 0.75 pt und unsere 0.05 pt Haarlinie. ) Die Haarlinie setzen wir nur
-bei Winword-Staerken bis zu maximal 0.5 pt ein.
+Note: In contrast to the regular WinWord table and frame border width,
+where the overall border width has to be calculated from the width of *one*
+line, the data from ESCHER already contains the overall width [twips]!
+
+The WinWord default is 15 tw. We take for this our 20 tw line.
+(0.75 pt and 1.0 pt looking more similar on hardcopy than 0.75 pt and our
+0.05 pt hairline.) The hairline we only set by WinWord width up to max.
+0.5 pt.
*/
switch( eStyle )
{
@@ -1546,15 +1545,14 @@ sal_Int32
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
eShapeType, rLineThick);
/*
-Beachte: im Gegensatz zu den Winword-ueblichen Tabellen- und
-Rahmen-Randbreiten-Angaben, bei denen jeweils aus der Staerke *einer*
-Linie die Gesamt-Randbreite zu errechnen ist, liegen die aus dem ESCHER
-stammenden Daten bereits als Gesamt-Breite [twips] vor!
-
-Der Winword default ist 15 tw. Wir nehmen hierfuer unsere 20 tw Linie. (
-0.75 pt uns 1.0 pt sehen sich auf dem Ausdruck naemlich aehnliche
[Libreoffice-commits] core.git: include/sfx2 sc/qa sd/qa sfx2/source starmath/qa sw/qa
include/sfx2/docfilt.hxx |2 --
include/sfx2/frmdescr.hxx |5 +
include/sfx2/notebookbar/NotebookbarTabControl.hxx |4 +++-
include/sfx2/viewsh.hxx|2 --
sc/qa/unit/helper/qahelper.cxx |6 +++---
sc/qa/unit/subsequent_export-test.cxx |2 +-
sc/qa/unit/subsequent_filters-test.cxx |2 +-
sd/qa/unit/filters-test.cxx|2 +-
sd/qa/unit/sdmodeltestbase.hxx |6 +++---
sfx2/source/bastyp/fltfnc.cxx |2 --
sfx2/source/bastyp/frmhtml.cxx | 11 +--
sfx2/source/doc/docfilt.cxx|7 ++-
sfx2/source/doc/frmdescr.cxx |2 --
sfx2/source/notebookbar/NotebookbarTabControl.cxx |6 +-
sfx2/source/view/frame.cxx |4
sfx2/source/view/sfxbasecontroller.cxx | 13 +
sfx2/source/view/viewimp.hxx |3 ---
sfx2/source/view/viewsh.cxx| 18 --
starmath/qa/extras/mmlimport-test.cxx |1 -
sw/qa/core/filters-test.cxx|2 +-
sw/qa/core/uwriter.cxx |2 +-
21 files changed, 24 insertions(+), 78 deletions(-)
New commits:
commit c0ce1ec3736be861a2ed58827fadb25269ab0117
Author: Noel Grandin
Date: Wed Jun 21 10:36:23 2017 +0200
loplugin:unusedfields in sfx2 part1
and fix a memory leak in NotebookbarTabControl where it was not freeing
it's m_pListener field
Change-Id: Ib9970c9084982d532fa38d1bc3c44180ab2c3c39
Reviewed-on: https://gerrit.libreoffice.org/39036
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index d4628b30027d..47454f90e742 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -60,7 +60,6 @@ class SFX2_DLLPUBLIC SfxFilter
SfxFilterFlags nFormatType;
sal_uIntPtr nVersion;
SotClipboardFormatId lFormat;
-sal_uInt16 nDocIcon;
public:
SfxFilter( const OUString& rProvider, const OUString& rFilterName );
@@ -70,7 +69,6 @@ public:
SfxFilterFlags nFormatType,
SotClipboardFormatId lFormat,
const OUString &rTypeName,
- sal_uInt16 nDocIcon,
const OUString &rMimeType,
const OUString &rUserData,
const OUString& rServiceName );
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 6cbda802055f..1e6e49e54215 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -66,9 +66,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
ScrollingMode eScroll;
boolbHasBorder;
boolbHasBorderSet;
-boolbResizeHorizontal;
boolbResizeVertical;
-boolbReadOnly;
std::unique_ptr< SfxFrameDescriptor_Impl > pImpl;
public:
@@ -81,12 +79,11 @@ public:
{ return aURL; }
voidSetURL( const OUString& rURL );
voidSetActualURL( const OUString& rURL );
-voidSetReadOnly( bool bSet ) { bReadOnly = bSet;}
voidSetEditable( bool bSet );
// Size
voidSetResizable( bool bRes )
-{ bResizeHorizontal = bResizeVertical = bRes; }
+{ bResizeVertical = bRes; }
// FrameName
const OUString& GetName() const
diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx
b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
index c6ff08e32273..9f6640dfe062 100644
--- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx
+++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
class ChangedUIEventListener;
@@ -22,6 +23,7 @@ friend class ChangedUIEventListener;
public:
NotebookbarTabControl( Window* pParent );
+~NotebookbarTabControl() override;
virtual void StateChanged(StateChangedType nStateChange) override;
virtual Size calculateRequisition() const override;
@@ -34,7 +36,7 @@ private:
);
DECL_LINK(OpenNotebookbarPopupMenu, NotebookBar*, void);
-ChangedUIEventListener* m_pListener;
+std::unique_ptr m_pListener;
css::uno::Reference m_xFrame;
protected:
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index a6dd243da4d7..6e7053421dae 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -317,8 +317,6 @@ public:
SAL_DLLPRIVATE void CheckIPClient_Impl(SfxInPlaceClient*, const
tools::Rectang
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 50ea3a50b5efc303f30bb91fabd1684476d8bbd1
Author: Aditya Dewan
Date: Wed Jun 21 16:23:45 2017 +0530
fix js lint error
Change-Id: I42183dc8865a6936de26e18459ab985e2f9bba1f
Reviewed-on: https://gerrit.libreoffice.org/39046
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index a0d9a5b5..448ec190 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -764,7 +764,7 @@ function onSearch(e) {
toolbar.hide('cancelsearch');
}
else {
- if(map.getDocType() === 'text')
+ if (map.getDocType() === 'text')
map.search(L.DomUtil.get('search-input').value, false,
'', 0, true /* expand search */);
toolbar.enable('searchprev');
toolbar.enable('searchnext');
___
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' - 6 commits - cui/source oox/source sc/inc sc/source sd/qa swext/mediawiki sw/uiconfig vcl/source
cui/source/dialogs/screenshotannotationdlg.cxx | 10 +-
oox/source/ppt/presentationfragmenthandler.cxx |4 ++--
sc/inc/externalrefmgr.hxx |2 +-
sc/source/ui/docshell/externalrefmgr.cxx | 13 +++--
sd/qa/unit/data/pptx/tdf89064.pptx |binary
sd/qa/unit/import-tests.cxx| 13 +
sw/uiconfig/swriter/ui/mmaddressblockpage.ui |1 -
swext/mediawiki/src/filter/odt2mediawiki.xsl |4 ++--
vcl/source/gdi/pdfwriter_impl.cxx | 11 ++-
9 files changed, 36 insertions(+), 22 deletions(-)
New commits:
commit 1e32cd7ed7e7aab6f8ec4e2f14e59dc47c633dd7
Author: Julien Nabet
Date: Sun Jun 11 21:57:14 2017 +0200
tdf#80671: mediawiki, no superscript tags allowed in footnotes
Change-Id: I54c2cc0fc6b2a9c631fc83f59c2204dd5e374d2c
Reviewed-on: https://gerrit.libreoffice.org/38666
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 6a24160894e91c007d4a2f8ef193eed670909ea5)
Reviewed-on: https://gerrit.libreoffice.org/38669
Reviewed-by: Miklos Vajna
(cherry picked from commit 1684ef2146dce6c132e3472b38b932d99f22b41c)
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 4aada97afd75..25fa68fddca2 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -1431,7 +1431,7 @@
-->
-
+
@@ -1469,7 +1469,7 @@
-
+
commit 384246b9c3ba2ef588ac11d3d801046168dfd407
Author: Vasily Melenchuk
Date: Thu May 25 13:44:52 2017 +0300
tdf#99680 modified clipping for PDF export
If clipping is requested, but no clipping region is defined,
clipping is ignored.
This squashes the following 3 commits:
Reviewed-on: https://gerrit.libreoffice.org/38021
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/38403
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/38694
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/38825
Tested-by: Thorsten Behrens
(cherry picked from commit f6726209329fefe9decca8fda8e136b8472a95a2)
Conflicts:
vcl/qa/cppunit/pdfexport/pdfexport.cxx
no pdf unit tests on -5-3, so dropping those pieces
Change-Id: I793c1de1f4f6b0203727c0ff6aa8adecc43ad413
d4565858b0135b3177044558db87a68ef828955b
102722140e216cb9ad29107aae3bdaa70472d471
Reviewed-on: https://gerrit.libreoffice.org/38852
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit 581806182ac7da81115c9675b4e828688178aa04)
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index c7eaa00c90b6..ae5aa6eaaf6c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -12983,12 +12983,13 @@ void PDFWriterImpl::updateGraphicsState(Mode const
mode)
getReferenceDevice()->SetMapMode( rNewState.m_aMapMode );
m_aCurrentPDFState.m_aMapMode = rNewState.m_aMapMode;
-aLine.append( "q " );
-if( rNewState.m_aClipRegion.count() )
+aLine.append("q ");
+if ( rNewState.m_aClipRegion.count() )
+{
m_aPages.back().appendPolyPolygon(
rNewState.m_aClipRegion, aLine );
-else
-aLine.append( "0 0 m h " ); // NULL clip, i.e. nothing
visible
-aLine.append( "W* n\n" );
+aLine.append( "W* n\n" );
+}
+
rNewState.m_aMapMode = aNewMapMode;
getReferenceDevice()->SetMapMode( rNewState.m_aMapMode );
m_aCurrentPDFState.m_aMapMode = rNewState.m_aMapMode;
commit aa4672625b45832bf2af251d391e9226dd3830a0
Author: Eike Rathke
Date: Wed Jun 14 23:30:57 2017 +0200
Resolves: tdf#104875 defer filter detection to first load/update of external
This is a combination of 2 commits.
This could never have been meant
Since commit 67b374980f340faa2695001984aaf98886a32fad
executing ScDocumentLoader::GetFilterName() twice if there was no stored
filter, and still executing it if there was one, even if the comment says we
shouldn't.
(cherry picked from co
[Libreoffice-commits] core.git: sc/source
sc/source/ui/vba/vbainterior.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1abdeff9de5d9257464048bcdf50a6d6fd926c0b Author: Tamas Bunth Date: Wed Jun 21 12:23:44 2017 +0200 Fix use of wrong function Input is a color, expected return value is an index. Change-Id: I1bb6977cea5aad7a89082ace12f0a85c58a0f2e3 Reviewed-on: https://gerrit.libreoffice.org/39045 Reviewed-by: Tamás Bunth Tested-by: Tamás Bunth diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index bd9b15cb49fe..6e7b626a8702 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -366,7 +366,7 @@ ScVbaInterior::getPatternColorIndex() sal_Int32 nColor = 0; XLRGBToOORGB( getPatternColor() ) >>= nColor; -return GetIndexColor( nColor ); +return uno::makeAny( GetColorIndex( nColor ) ); } void SAL_CALL ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/emfplusprimitiveparser' - drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/source
drawinglayer/Library_drawinglayer.mk| 34 drawinglayer/inc/emfplushelper.hxx | 52 drawinglayer/inc/wmfemfhelper.hxx | 215 + drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 3198 drawinglayer/source/tools/emfpbrush.cxx | 328 + drawinglayer/source/tools/emfpbrush.hxx | 130 drawinglayer/source/tools/emfpcustomlinecap.cxx | 158 drawinglayer/source/tools/emfpcustomlinecap.hxx | 45 drawinglayer/source/tools/emfpfont.cxx | 69 drawinglayer/source/tools/emfpfont.hxx | 40 drawinglayer/source/tools/emfphelperdata.cxx| 1232 ++ drawinglayer/source/tools/emfphelperdata.hxx| 252 + drawinglayer/source/tools/emfpimage.cxx | 95 drawinglayer/source/tools/emfpimage.hxx | 42 drawinglayer/source/tools/emfplushelper.cxx | 47 drawinglayer/source/tools/emfppath.cxx | 192 drawinglayer/source/tools/emfppath.hxx | 47 drawinglayer/source/tools/emfppen.cxx | 301 + drawinglayer/source/tools/emfppen.hxx | 77 drawinglayer/source/tools/emfpregion.cxx| 90 drawinglayer/source/tools/emfpregion.hxx| 42 drawinglayer/source/tools/emfpstringformat.cxx | 61 drawinglayer/source/tools/emfpstringformat.hxx | 52 drawinglayer/source/tools/wmfemfhelper.cxx | 3119 +++ 24 files changed, 6753 insertions(+), 3165 deletions(-) New commits: commit d97090d645b4fc8a2fd7d7cdbe02ddb280aa3d50 Author: Armin Le Grand Date: Wed Jun 21 12:19:52 2017 +0200 emfplus: migrate gdiplus reader to drawinglayer In the current state interpretation of the GDI+ data is needed in the MetafilePrimitive in the drawinglayer project. Migrate helper stuff and reader from cppcanvas to drawinglayer as tooling, prepare tooling, prepare changing from direct canvas rendering, isolate and migrate existing tooling from MetafilePrimitive from reading emf/wmf to places where it can be commonly used by both, prepare cange of different graphic statue usages, start changing XForm to B2DHomMatrix conversions, ... Change-Id: I2d6954f69464653d111abb316fd9654ad3499c3f diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 8c431c8ec08f..299c33f507b8 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,drawinglayer)) +$(eval $(call gb_Library_set_include,drawinglayer,\ +$$(INCLUDE) \ +-I$(SRCDIR)/drawinglayer/inc \ +)) + $(eval $(call gb_Library_add_defs,drawinglayer,\ -DDRAWINGLAYER_DLLIMPLEMENTATION \ )) @@ -69,7 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/borderlineprimitive2d \ drawinglayer/source/primitive2d/clippedborderlineprimitive2d \ drawinglayer/source/primitive2d/controlprimitive2d \ - drawinglayer/source/primitive2d/cropprimitive2d \ +drawinglayer/source/primitive2d/cropprimitive2d \ drawinglayer/source/primitive2d/discretebitmapprimitive2d \ drawinglayer/source/primitive2d/discreteshadowprimitive2d \ drawinglayer/source/primitive2d/embedded3dprimitive2d \ @@ -77,7 +82,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/fillgraphicprimitive2d \ drawinglayer/source/primitive2d/fillgradientprimitive2d \ drawinglayer/source/primitive2d/fillhatchprimitive2d \ - drawinglayer/source/primitive2d/graphicprimitivehelper2d \ +drawinglayer/source/primitive2d/graphicprimitivehelper2d \ drawinglayer/source/primitive2d/graphicprimitive2d \ drawinglayer/source/primitive2d/gridprimitive2d \ drawinglayer/source/primitive2d/groupprimitive2d \ @@ -91,7 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/modifiedcolorprimitive2d \ drawinglayer/source/primitive2d/objectinfoprimitive2d \ drawinglayer/source/primitive2d/pagepreviewprimitive2d \ - drawinglayer/source/primitive2d/patternfillprimitive2d \ +drawinglayer/source/primitive2d/patternfillprimitive2d \ drawinglayer/source/primitive2d/pointarrayprimitive2d \ drawinglayer/source/primitive2d/polygonprimitive2d \ drawinglayer/source/primitive2d/polypolygonprimitive2d \ @@ -100,8 +105,8 @@ $(eval $(call gb_Library_add_exception_objects,drawinglayer,\ drawinglayer/source/primitive2d/sdrdecompositiontools2d \ drawinglayer/source/primitive2d/shadowprimitive2d \ drawinglayer/source/primitive2d/structuretagprimitive2d \ - drawinglayer/source/primitive2d/svggradientprimitive2d \ - drawinglayer/sour
[Libreoffice-commits] core.git: cui/source include/svtools sd/source svtools/source sw/source
cui/source/tabpages/backgrnd.cxx|2 --
cui/source/tabpages/tphatch.cxx |1 -
include/svtools/brwbox.hxx |1 -
include/svtools/calendar.hxx|3 ---
include/svtools/ctrlbox.hxx |3 ---
include/svtools/fileview.hxx|5 ++---
include/svtools/grfmgr.hxx |1 -
include/svtools/headbar.hxx |9 +++--
include/svtools/inettbc.hxx |1 -
include/svtools/ivctrl.hxx |1 -
include/svtools/parhtml.hxx |3 +--
include/svtools/ruler.hxx |5 -
include/svtools/svlbitm.hxx |3 +--
include/svtools/svtabbx.hxx |2 --
include/svtools/tabbar.hxx |1 -
include/svtools/valueset.hxx|2 --
sd/source/ui/view/drviews1.cxx |3 ---
svtools/source/brwbox/brwbox1.cxx |7 +++
svtools/source/contnr/fileview.cxx |6 --
svtools/source/contnr/imivctl.hxx |7 +--
svtools/source/contnr/imivctl1.cxx |3 ---
svtools/source/contnr/ivctrl.cxx|5 -
svtools/source/contnr/svimpbox.cxx |9 +++--
svtools/source/contnr/svlbitm.cxx |6 ++
svtools/source/contnr/svtabbx.cxx |1 -
svtools/source/control/calendar.cxx | 19 ---
svtools/source/control/ctrlbox.cxx |1 -
svtools/source/control/headbar.cxx |2 --
svtools/source/control/inettbc.cxx |5 -
svtools/source/control/ruler.cxx|7 ---
svtools/source/control/tabbar.cxx |3 ---
svtools/source/control/valueset.cxx |1 -
svtools/source/graphic/grfmgr.cxx |1 -
svtools/source/inc/svimpbox.hxx |7 ++-
svtools/source/svhtml/parhtml.cxx |6 +-
sw/source/filter/html/swhtml.cxx|4 ++--
sw/source/ui/frmdlg/column.cxx |1 -
37 files changed, 21 insertions(+), 126 deletions(-)
New commits:
commit 9e61a951374a3f7705de67295e406e929c603a42
Author: Noel Grandin
Date: Tue Jun 20 15:59:42 2017 +0200
loplugin:unusedfields in svtools
Change-Id: Ic8f67d40825d9843fd57535bd61bef51b470a8be
Reviewed-on: https://gerrit.libreoffice.org/39016
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 5524c260aa3b..c2149a9a3efa 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -602,7 +602,6 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const
SfxItemSet& rSet )
aBgdColor = pBgdAttr->GetColor();
sal_uInt16 nCol = GetItemId_Impl(*m_pBackgroundColorSet,
aBgdColor);
m_pBackgroundColorSet->SelectItem( nCol );
-m_pBackgroundColorSet->SaveValue();
m_pPreviewWin1->NotifyChange( aBgdColor );
}
}
@@ -1427,7 +1426,6 @@ void SvxBackgroundTabPage::FillControls_Impl( const
SvxBrushItem& rBgdAttr,
{
m_pBackgroundColorSet->SelectItem( nCol );
}
-m_pBackgroundColorSet->SaveValue();
m_pPreviewWin1->NotifyChange( aBgdColor );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 42e7c6e39231..45b14ec5d2ca 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -426,7 +426,6 @@ void SvxHatchTabPage::ChangeHatchHdl_Impl()
m_pLbLineType->SaveValue();
m_pLbLineColor->SaveValue();
m_pLbBackgroundColor->SaveValue();
-m_pHatchLB->SaveValue();
}
IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 053d7dcc24c9..2f21d512781c 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -203,7 +203,6 @@ private:
longnDataRowHeight; // height of a single data-row
sal_uInt16 nTitleLines;// number of lines in title row
sal_uLong nControlAreaWidth; // width of fixed area beneath hscroll
-boolbThumbDragging; // handle thumb dragging
boolbColumnCursor; // single columns and fields selectable
boolbMultiSelection;// allow multiple selected rows
boolbKeepHighlight; // don't hide selection on LoseFocus
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 4c190b73c157..e0c583e732a1 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -195,15 +195,12 @@ private:
mbDrag:1,
mbSelection:1,
mbMultiSelection:1,
-mbWeekSel:1,
mbUnSel:1,
mbMenuDown:1,
mbSpinDown:1,
mbPrevIn:1,
mbNextIn:1,
-mbDirect:1,
mbTravelSelect:1,
-mbScrollDateRange:1,
mbSelLeft:1,
mbAllSel:1,
mbDropPos:1;
diff --g
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js| 17 +
loleaflet/src/control/Control.Menubar.js | 12 +++-
2 files changed, 20 insertions(+), 9 deletions(-)
New commits:
commit 7a69dc16509cee56f1a90b459c8189c5cfb08add
Author: Aditya Dewan
Date: Sat Jun 17 08:48:13 2017 +0530
disable search as type from the dialog box for calc/impress
Change-Id: I93fa810876c405ea29521ecd90d4cf70affc7994
Reviewed-on: https://gerrit.libreoffice.org/38904
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index b2657afb..a0d9a5b5 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -757,10 +757,19 @@ function selectItem(item, func)
}
function onSearch(e) {
var toolbar = w2ui['toolbar-down'];
- map.search(L.DomUtil.get('search-input').value, false, '', 0, true /*
expand search */);
- toolbar.enable('searchprev');
- toolbar.enable('searchnext');
- toolbar.show('cancelsearch');
+ // conditionally disabling until, we find a solution for tdf#108577
+ if (L.DomUtil.get('search-input').value === '') {
+ toolbar.disable('searchprev');
+ toolbar.disable('searchnext');
+ toolbar.hide('cancelsearch');
+ }
+ else {
+ if(map.getDocType() === 'text')
+ map.search(L.DomUtil.get('search-input').value, false,
'', 0, true /* expand search */);
+ toolbar.enable('searchprev');
+ toolbar.enable('searchnext');
+ toolbar.show('cancelsearch');
+ }
}
function onSearchKeyPress(e) {
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 71b9f774..af87725d 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -499,11 +499,13 @@ L.Control.Menubar = L.Control.extend({
var xElem = 0, yElem = 0;
var maxH = window.innerHeight, maxW =
window.innerWidth;
- $('#findthis').on('input', function() {
- if (this.value.length != 0) {
- map.search(this.value, false,
'', 0, true);
- }
- });
+ if (map.getDocType() === 'text') {
+ $('#findthis').on('input', function() {
+ if (this.value.length != 0) {
+ map.search(this.value,
false, '', 0, true);
+ }
+ });
+ }
$('.vex-content').on('mousedown', function(e) {
selected = this;
selected.style.cursor = 'move';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - cui/source
cui/source/inc/backgrnd.hxx |1 +
cui/source/tabpages/backgrnd.cxx | 12 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 21cf4bb57665af0c7e2dad01729e8e18480c1b90
Author: Eike Rathke
Date: Tue Jun 20 23:56:44 2017 +0200
Resolves: tdf#105740 select without selecting.. tdf#101588 b0rk
The initial color, if determined, must result in being selected.
Differentiate
between pre-selected and user-selected.
Regression of
commit 429be969b39867d6d9f36978c9ac15b601e78ba6
Date: Mon Dec 12 21:24:20 2016 +0100
Change-Id: I928af131d03c61a8e474e5cd356aea8b766112fa
(cherry picked from commit aee66aa85e75f67135e5c6079a281e18402d261a)
Reviewed-on: https://gerrit.libreoffice.org/39025
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 59776c8acb40..d95fe6084ea3 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -107,6 +107,7 @@ private:
boolbIsGraphicValid : 1;
boolbLinkOnly : 1;
boolbHighlighting : 1;
+boolm_bColorSelected: 1;
Graphic aBgdGraphic;
OUStringaBgdGraphicPath;
OUStringaBgdGraphicFilter;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 407550d2bf3f..d5acbd4ba00a 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -331,6 +331,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window*
pParent, const SfxItemSe
, bIsGraphicValid(false)
, bLinkOnly(false)
, bHighlighting(false)
+, m_bColorSelected(false)
, pPageImpl(new SvxBackgroundPage_Impl)
, pImportDlg(nullptr)
, pTableBck_Impl(nullptr)
@@ -449,6 +450,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
return;
}
+m_bColorSelected = false;
+
// condition of the preview button is persistent due to UserData
OUString aUserData = GetUserData();
m_pBtnPreview->Check( !aUserData.isEmpty() && '1' == aUserData[0] );
@@ -683,7 +686,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet*
rCoreSet )
{
// Brush-treatment:
if ( rOldItem.GetColor() != aBgdColor ||
- (SfxItemState::DEFAULT >= eOldItemState &&
!m_pBackgroundColorSet->IsNoSelection()))
+ (SfxItemState::DEFAULT >= eOldItemState &&
m_bColorSelected))
{
bModified = true;
rCoreSet->Put( SvxBrushItem( aBgdColor, nWhich ) );
@@ -1137,6 +1140,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage,
BackgroundColorHdl_Impl, ValueSet*, void)
sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId();
Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId )
) : Color( COL_TRANSPARENT );
aBgdColor = aColor;
+m_bColorSelected = true;
m_pPreviewWin1->NotifyChange( aBgdColor );
}
@@ -1422,13 +1426,9 @@ void SvxBackgroundTabPage::FillControls_Impl( const
SvxBrushItem& rBgdAttr,
}
else
{
-bool bNoSelection = m_pBackgroundColorSet->IsNoSelection();
m_pBackgroundColorSet->SelectItem( nCol );
-m_pBackgroundColorSet->SaveValue();
-// The actual selection is user set, not what we preset.
-if (bNoSelection)
-m_pBackgroundColorSet->SetNoSelection();
}
+m_pBackgroundColorSet->SaveValue();
m_pPreviewWin1->NotifyChange( aBgdColor );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/svx sd/source svx/inc svx/source sw/source
cui/source/tabpages/page.cxx | 37 -
cui/source/tabpages/paragrph.cxx | 20 ---
include/svx/ctredlin.hxx |1
include/svx/fmmodel.hxx|1
include/svx/frmdirlbox.hxx |6
include/svx/gridctrl.hxx |1
include/svx/itemwin.hxx|2 -
include/svx/langbox.hxx|1
include/svx/nbdtmg.hxx | 12 +++--
include/svx/pagectrl.hxx |7 -
include/svx/paraprev.hxx |7 ++---
include/svx/relfld.hxx |4 ---
include/svx/sidebar/LineWidthPopup.hxx |2 -
include/svx/svddrgv.hxx|4 ---
include/svx/svdedtv.hxx| 12 -
include/svx/svdedxv.hxx|5 +--
include/svx/svdetc.hxx |3 --
include/svx/svdmodel.hxx |8 --
include/svx/svdmrkv.hxx|5 ---
sd/source/ui/dlg/brkdlg.cxx|2 -
sd/source/ui/func/futext.cxx |2 -
sd/source/ui/view/sdview.cxx |1
svx/inc/svdibrow.hxx |4 ---
svx/source/dialog/ctredlin.cxx |3 --
svx/source/dialog/frmdirlbox.cxx |1
svx/source/dialog/hdft.cxx | 35 ---
svx/source/dialog/langbox.cxx |4 ---
svx/source/dialog/pagectrl.cxx | 31
svx/source/dialog/paraprev.cxx |4 ---
svx/source/dialog/relfld.cxx |5 ---
svx/source/fmcomp/gridcell.cxx |7 -
svx/source/fmcomp/gridctrl.cxx |3 --
svx/source/form/fmPropBrw.cxx |3 --
svx/source/form/fmmodel.cxx| 12 -
svx/source/inc/fmPropBrw.hxx |1
svx/source/inc/gridcell.hxx|3 --
svx/source/sidebar/line/LineWidthPopup.cxx | 10 ---
svx/source/sidebar/nbdtmg.cxx |2 -
svx/source/svdraw/svddrgv.cxx |5 ---
svx/source/svdraw/svdedtv.cxx |9 ---
svx/source/svdraw/svdedxv.cxx |1
svx/source/svdraw/svdetc.cxx |4 ---
svx/source/svdraw/svdibrow.cxx |8 --
svx/source/svdraw/svdmodel.cxx | 10 ---
svx/source/svdraw/svdmrkv.cxx |1
svx/source/tbxctrls/itemwin.cxx| 12 ++---
sw/source/core/draw/dview.cxx |1
sw/source/uibase/frmdlg/colex.cxx | 14 --
48 files changed, 26 insertions(+), 310 deletions(-)
New commits:
commit 95c348afa8f4f17c058c449ded75025175af0e4a
Author: Noel Grandin
Date: Tue Jun 20 14:26:45 2017 +0200
loplugin:unusedfields in svx part2
Change-Id: Ie9fd55b71a152f428a397d9917918f0e9de39aaf
Reviewed-on: https://gerrit.libreoffice.org/39014
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 437cdb41a0e5..147242fe1df1 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1163,14 +1163,6 @@ void SvxPageDescPage::ResetBackground_Impl(const
SfxItemSet& rSet)
}
m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes);
-nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
-if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
-{
-const SvxBoxItem& rItem =
-static_cast(rTmpSet.Get( nWhich ));
-m_pBspWin->SetHdBorder( rItem );
-}
}
}
@@ -1207,13 +1199,6 @@ void SvxPageDescPage::ResetBackground_Impl(const
SfxItemSet& rSet)
}
m_pBspWin->setFooterFillAttributes(aFooterFillAttributes);
-nWhich = GetWhich(SID_ATTR_BORDER_OUTER);
-
-if(rTmpSet.GetItemState(nWhich) == SfxItemState::SET)
-{
-const SvxBoxItem& rItem = static_cast< const SvxBoxItem&
>(rTmpSet.Get(nWhich));
-m_pBspWin->SetFtBorder(rItem);
-}
}
}
@@ -1241,12 +1226,6 @@ void SvxPageDescPage::ResetBackground_Impl(const
SfxItemSet& rSet)
}
m_pBspWin->setPageFillAttributes(aPageFillAttributes);
-pItem = GetItem(rSet, SID_ATTR_BORDER_OUTER);
-
-if(pItem)
-{
-m_pBspWin->SetBorder(static_cast< const SvxBoxItem& >(*pItem));
-}
}
void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
@@ -1311,14 +1290,6 @@ void SvxPageDescPage::InitHeadFoot_Impl( const
SfxItemSet& rSet )
}
m_pBspWin->setHeaderFillAttributes(aHeaderFillAttributes);
-const sal_uInt16 nWhich(GetWhich(SID_ATTR_BORDER_OUTER));
-
-if ( rHeaderSet.GetItemState( nWhich ) >= SfxIt
[Libreoffice-commits] core.git: include/o3tl
include/o3tl/safeint.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2149d4a88e9dc88c30e7475f8ea317e5c7b78529
Author: brainbreaker
Date: Tue Jun 20 15:14:32 2017 +0530
android:update safeint header to use the else implementation with clang
Clang toolchain does not defines the __builtin_mul_overflow for 32-bit
ARM. So, fallback to else implementation of checked_multiply when
building Android with Clang
Change-Id: I6120606f521ce121541a5b7f1150229258012d55
Reviewed-on: https://gerrit.libreoffice.org/39005
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index ce144d22d9ea..80a152b83290 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -29,7 +29,7 @@ template inline bool checked_multiply(T a, T b,
T& result)
return !msl::utilities::SafeMultiply(a, b, result);
}
-#elif (defined __GNUC__ && __GNUC__ >= 5) ||
(__has_builtin(__builtin_mul_overflow))
+#elif (defined __GNUC__ && __GNUC__ >= 5) ||
(__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined
__clang__))
template inline bool checked_multiply(T a, T b, T& result)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/basflt/fltini.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 67ef8e99e87b6263334d01f37487d1d385b30b9b Author: Noel Grandin Date: Wed Jun 21 10:07:06 2017 +0200 fix android build after commit 528632660b72b105345945c13c5b68060d94a91b "convert ErrCode to strong typedef" Change-Id: I31727d89f6450e5d1d0930abf7dba7a32f8b894a diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index f112ee9a77cb..3a0cc3648f7f 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -736,7 +736,7 @@ ErrCode SaveOrDelMSVBAStorage( SfxObjectShell& rDoc, SotStorage& rStor, bool bSa return ErrCode(pFunction( rDoc, rStor, bSaveInto, rStorageName )); return ERRCODE_NONE; #else -return SaveOrDelMSVBAStorage_ww8( rDoc, rStor, bSaveInto, rStorageName ); +return ErrCode(SaveOrDelMSVBAStorage_ww8( rDoc, rStor, bSaveInto, rStorageName )); #endif } @@ -748,7 +748,7 @@ ErrCode GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ) return ErrCode(pFunction( rDocS )); return ERRCODE_NONE; #else -return GetSaveWarningOfMSVBAStorage_ww8( rDocS ); +return ErrCode(GetSaveWarningOfMSVBAStorage_ww8( rDocS )); #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 1684ef2146dce6c132e3472b38b932d99f22b41c Author: Julien Nabet Date: Sun Jun 11 21:57:14 2017 +0200 tdf#80671: mediawiki, no superscript tags allowed in footnotes Change-Id: I54c2cc0fc6b2a9c631fc83f59c2204dd5e374d2c Reviewed-on: https://gerrit.libreoffice.org/38666 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 6a24160894e91c007d4a2f8ef193eed670909ea5) Reviewed-on: https://gerrit.libreoffice.org/38669 Reviewed-by: Miklos Vajna diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 4aada97afd75..25fa68fddca2 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1431,7 +1431,7 @@ --> - + @@ -1469,7 +1469,7 @@ - + ___ 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/ooxmlexport9.cxx | 12
writerfilter/source/dmapper/StyleSheetTable.cxx | 14 ++
2 files changed, 26 insertions(+)
New commits:
commit 0f4038abcd3d5f93847f7f27ffbb990f6a19c4ba
Author: Justin Luth
Date: Sat Jun 3 20:09:48 2017 +0300
tdf#82173 writerfilter: copy Xnote Characters -> Xnote anchor
In MSWord, Footnote Reference applies to both in-text and in-footnote
formating of the reference number, while LO uses two.
Convert into one style, and copy into the other style.
Change-Id: I8cf731d5d1236c86fc1c82e798d8a459ca95d0ba
Reviewed-on: https://gerrit.libreoffice.org/38374
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 2ad863161780..39af9d435af7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -527,6 +527,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82173_footnoteStyle,
"tdf82173_footnoteStyle.doc
uno::Reference
xPageStyle(getStyles("CharacterStyles")->getByName("Footnote Characters"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL( sal_Int32(58), getProperty< sal_Int32
>(xPageStyle, "CharEscapementHeight") );
CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00FF00), getProperty< sal_Int32
>(xPageStyle, "CharColor") );
+
+xPageStyle.set(getStyles("CharacterStyles")->getByName("Footnote anchor"),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(58), getProperty< sal_Int32
>(xPageStyle, "CharEscapementHeight") );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00FF00), getProperty< sal_Int32
>(xPageStyle, "CharColor") );
}
DECLARE_OOXMLEXPORT_TEST(testTdf82173_endnoteStyle,
"tdf82173_endnoteStyle.docx")
@@ -538,6 +542,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82173_endnoteStyle,
"tdf82173_endnoteStyle.docx"
// character properties were previously not assigned to the
footnote/endnote in-text anchor.
CPPUNIT_ASSERT_EQUAL( 24.0f, getProperty< float >(xEndnote->getAnchor(),
"CharHeight") );
CPPUNIT_ASSERT_EQUAL( sal_Int32(0xFF), getProperty< sal_Int32
>(xEndnote->getAnchor(), "CharColor") );
+
+uno::Reference
xPageStyle(getStyles("CharacterStyles")->getByName("Endnote Characters"),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(58), getProperty< sal_Int32
>(xPageStyle, "CharEscapementHeight") );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0xFF00FF), getProperty< sal_Int32
>(xPageStyle, "CharColor") );
+
+xPageStyle.set(getStyles("CharacterStyles")->getByName("Endnote anchor"),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( sal_Int32(58), getProperty< sal_Int32
>(xPageStyle, "CharEscapementHeight") );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0xFF00FF), getProperty< sal_Int32
>(xPageStyle, "CharColor") );
}
DECLARE_OOXMLEXPORT_TEST(testTdf104162, "tdf104162.docx")
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index dd90f543427b..53fb4c1b3d0c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1135,6 +1135,20 @@ void StyleSheetTable::ApplyStyleSheets( const
FontTablePtr& rFontTable )
{
uno::Reference< beans::XMultiPropertySet >
xMultiPropertySet( xStyle, uno::UNO_QUERY_THROW);
xMultiPropertySet->setPropertyValues(
aSortedPropVals.getNames(), aSortedPropVals.getValues() );
+
+// Duplicate MSWord's single footnote reference
into Footnote Characters and Footnote anchor
+if(
pEntry->sStyleName.equalsIgnoreAsciiCase("footnote reference")
+||
pEntry->sStyleName.equalsIgnoreAsciiCase("endnote reference") )
+{
+uno::Reference< style::XStyle > xCopyStyle;
+if(
pEntry->sStyleName.equalsIgnoreAsciiCase("footnote reference") )
+xStyles->getByName( "Footnote anchor" )
>>= xCopyStyle;
+else
+xStyles->getByName( "Endnote anchor" ) >>=
xCopyStyle;
+
+xMultiPropertySet.set( xCopyStyle,
uno::UNO_QUERY_THROW);
+xMultiPropertySet->setPropertyValues(
aSortedPropVals.getNames(), aSortedPropVals.getValues() );
+}
}
catch( const lang::WrappedTargetException& rWrapped)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlimport/htmlimport.cxx | 50 ++---
1 file changed, 34 insertions(+), 16 deletions(-)
New commits:
commit 8f2f277571091045fb57cec7f225a3391cc374b1
Author: Vasily Melenchuk
Date: Tue Jun 20 16:42:14 2017 +0300
sw_htmlimport::testTableBorder1px testcase simplified
Goal of this testcase is just to ensure that some table cell borders
exist while some others do not. There is no reason to do exact width
comparison which is causing errors on some MacOS configurations.
Change-Id: I574c29220696ae654dea2db0398790a440efd83b
Reviewed-on: https://gerrit.libreoffice.org/39015
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 19f51c1824ea..5e704b3f3be9 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -228,29 +228,47 @@ DECLARE_HTMLIMPORT_TEST(testTableBorder1px,
"table_border_1px.html")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+table::BorderLine2 aBorder;
+
uno::Reference xCellA1(xTable->getCellByName("A1"),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellA1,"TopBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,0,2,4,3,2),
getProperty(xCellA1,"BottomBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellA1,"LeftBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellA1,"RightBorder"));
+aBorder = getProperty(xCellA1, "TopBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell top border", aBorder.InnerLineWidth >
0);
+aBorder = getProperty(xCellA1, "BottomBorder");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cell bottom border",
sal_Int16(0), aBorder.InnerLineWidth);
+aBorder = getProperty(xCellA1, "LeftBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell left border", aBorder.InnerLineWidth
> 0);
+aBorder = getProperty(xCellA1, "RightBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell right border", aBorder.InnerLineWidth
> 0);
uno::Reference xCellB1(xTable->getCellByName("B1"),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellB1,"TopBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,0,2,4,3,2),
getProperty(xCellB1,"BottomBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,0,2,4,3,2),
getProperty(xCellB1,"LeftBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellB1,"RightBorder"));
+aBorder = getProperty(xCellB1, "TopBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell top border", aBorder.InnerLineWidth >
0);
+aBorder = getProperty(xCellB1, "BottomBorder");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cell bottom border",
sal_Int16(0), aBorder.InnerLineWidth);
+aBorder = getProperty(xCellB1, "LeftBorder");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cell left border", sal_Int16(0),
aBorder.InnerLineWidth);
+aBorder = getProperty(xCellB1, "RightBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell right border", aBorder.InnerLineWidth
> 0);
uno::Reference xCellA2(xTable->getCellByName("A2"),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x0,0,0,0,0,0),
getProperty(xCellA2,"TopBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,0,2,4,3,2),
getProperty(xCellA2,"BottomBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellA2,"LeftBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellA2,"RightBorder"));
+aBorder = getProperty(xCellA2, "TopBorder");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cell top border", sal_Int16(0),
aBorder.InnerLineWidth);
+aBorder = getProperty(xCellA2, "BottomBorder");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected cell bottom border",
sal_Int16(0), aBorder.InnerLineWidth);
+aBorder = getProperty(xCellA2, "LeftBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell left border", aBorder.InnerLineWidth
> 0);
+aBorder = getProperty(xCellA2,"RightBorder");
+CPPUNIT_ASSERT_MESSAGE("Missing cell right border", aBorder.InnerLineWidth
> 0);
uno::Reference xCellB2(xTable->getCellByName("B2"),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x0,0,0,0,0,0),
getProperty(xCellB2,"TopBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,0,2,4,3,2),
getProperty(xCellB2,"BottomBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,0,2,4,3,2),
getProperty(xCellB2,"LeftBorder"));
-CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0x808080,9,9,9,3,26),
getProperty(xCellB2,
[Libreoffice-commits] online.git: net/Socket.hpp
net/Socket.hpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ffbe55adb530813acd640faaa55f85f00c570080
Author: Miklos Vajna
Date: Wed Jun 21 09:05:42 2017 +0200
SocketDisposition::setMove(): parameter is passed by value, move it
Change-Id: I2c7facfc4fc5422cef886c6ba28ac60c656a908e
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 4c410d23..d1d3018d 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -74,7 +74,7 @@ public:
}
void setMove(MoveFunction moveFn)
{
-_socketMove = moveFn;
+_socketMove = std::move(moveFn);
_disposition = Type::MOVE;
}
void setClosed()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source
xmlsecurity/inc/xmlsec-wrapper.h |3
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 39 ++
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |2
3 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit 9752eccdd06f6695ec4f173ea93cada65063d1f0
Author: Miklos Vajna
Date: Tue Jun 20 21:47:38 2017 +0200
xmlsecurity nss: adopt the private key of the signing certificate explicitly
xmlsec1-customkeymanage.patch.1 of our bundled xmlsec extends
xmlSecNssKeyDataX509VerifyAndExtractKey(), so that it calls
xmlSecNssPKIAdoptKey() for the private key of the signing certificate.
Make this explicit in xmlsecurity/ code, so we don't depend on the
patched xmlSecNssKeyDataX509VerifyAndExtractKey().
This is harmless for the patched xmlsec, but it prevents this error:
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48:
keys.c:1246: xmlSecKeysMngrGetKey() '' 'xmlSecKeysMngrFindKey' 1 ' '
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48:
xmldsig.c:790: xmlSecDSigCtxProcessKeyInfoNode() '' '' 45 'details=NULL'
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48:
xmldsig.c:503: xmlSecDSigCtxProcessSignatureNode() ''
'xmlSecDSigCtxProcessKeyInfoNode' 1 ' '
warn:xmlsecurity.xmlsec:26221:1:xmlsecurity/source/xmlsec/errorcallback.cxx:48:
xmldsig.c:286: xmlSecDSigCtxSign() '' 'xmlSecDSigCtxSignatureProcessNode' 1 ' '
when xmlsec is not patched.
(This is needed, but not enough to build against system xmlsec.)
Change-Id: I5d68a8be7aefcb529566213f9b9c2985eab6a80a
Reviewed-on: https://gerrit.libreoffice.org/39023
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/xmlsecurity/inc/xmlsec-wrapper.h b/xmlsecurity/inc/xmlsec-wrapper.h
index 3d5c24b9b6f1..4a8a6554311b 100644
--- a/xmlsecurity/inc/xmlsec-wrapper.h
+++ b/xmlsecurity/inc/xmlsec-wrapper.h
@@ -40,6 +40,9 @@
#include "xmlsec/xmlenc.h"
#include "xmlsec/xmlsec.h"
#include "xmlsec/xmltree.h"
+#ifdef XMLSEC_CRYPTO_NSS
+#include "xmlsec/nss/pkikeys.h"
+#endif
#endif
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 959e62cc34e0..a5b29017d180 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -474,6 +474,9 @@ Reference< XCertificate >
SecurityEnvironment_NssImpl::getCertificate( const OUS
}
Sequence< Reference < XCertificate > >
SecurityEnvironment_NssImpl::buildCertificatePath( const Reference<
XCertificate >& begin ) {
+// Remember the signing certificate.
+m_xSigningCertificate = begin;
+
const X509Certificate_NssImpl* xcert ;
const CERTCertificate* cert ;
CERTCertList* certChain ;
@@ -881,19 +884,8 @@ X509Certificate_NssImpl* NssPrivKeyToXCert(
SECKEYPrivateKey* priKey )
return xcert ;
}
-
-/* Native methods */
xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() {
-unsigned int i ;
-CERTCertDBHandle* handler = nullptr ;
-PK11SymKey* symKey = nullptr ;
-SECKEYPublicKey* pubKey = nullptr ;
-SECKEYPrivateKey* priKey = nullptr ;
-xmlSecKeysMngrPtr pKeysMngr = nullptr ;
-
-handler = m_pHandler;
-
/*-
* The following lines is based on the private version of xmlSec-NSS
* crypto engine
@@ -905,14 +897,15 @@ xmlSecKeysMngrPtr
SecurityEnvironment_NssImpl::createKeysManager() {
for (CIT_SLOTS islots = m_Slots.begin();islots != m_Slots.end(); ++islots,
++count)
slots[count] = *islots;
-pKeysMngr = xmlSecNssAppliedKeysMngrCreate(slots, cSlots, handler ) ;
+xmlSecKeysMngrPtr pKeysMngr = xmlSecNssAppliedKeysMngrCreate(slots,
cSlots, m_pHandler ) ;
if( pKeysMngr == nullptr )
throw RuntimeException() ;
/*-
* Adopt symmetric key into keys manager
*/
-for( i = 0 ; ( symKey = this->getSymKey( i ) ) != nullptr ; i ++ ) {
+PK11SymKey* symKey = nullptr ;
+for( unsigned int i = 0 ; ( symKey = this->getSymKey( i ) ) != nullptr ; i
++ ) {
if( xmlSecNssAppliedKeysMngrSymKeyLoad( pKeysMngr, symKey ) < 0 ) {
throw RuntimeException() ;
}
@@ -921,7 +914,8 @@ xmlSecKeysMngrPtr
SecurityEnvironment_NssImpl::createKeysManager() {
/*-
* Adopt asymmetric public key into keys manager
*/
-for( i = 0 ; ( pubKey = this->getPubKey( i ) ) != nullptr ; i ++ ) {
+SECKEYPublicKey* pubKey = nullptr ;
+for( unsigned int i = 0 ; ( pubKey = this->getPubKey( i ) ) != nullptr ; i
++ ) {
if( xmlSecNssAppliedKeysMngrPubKeyLoad( pKeysMngr, pubKey ) < 0 ) {
throw RuntimeException() ;
}
@@ -930,11 +924,26 @@ xmlSecKeysMngrPtr
SecurityEnvironment_NssImpl::createKeysManager() {
/*-
