[Libreoffice-commits] core.git: Branch 'feature/priorities' - sd/inc sd/source svx/source
sd/inc/drawdoc.hxx |2 +-
sd/source/core/drawdoc.cxx |2 +-
sd/source/core/drawdoc4.cxx | 18 +-
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 18 +-
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx |2 +-
svx/source/stbctrls/modctrl.cxx | 16 +---
6 files changed, 26 insertions(+), 32 deletions(-)
New commits:
commit 3f3f83678e6f1734ee2e9b087207c558f40730a1
Author: Tobias Madl tobias.madl@gmail.com
Date: Fri Nov 21 08:12:11 2014 +
changed timers to idles
Change-Id: Iac97f482df9fca8563e6931e4c710c1cc4e6503d
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 6cd99ce..524dcba 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -149,7 +149,7 @@ private:
::sd::Outliner* mpOutliner; /// local outliner for outline
mode
::sd::Outliner* mpInternalOutliner; /// internal outliner for
creation of text objects
Timer* mpWorkStartupTimer;
-Timer* mpOnlineSpellingTimer;
+Idle* mpOnlineSpellingIdle;
sd::ShapeList* mpOnlineSpellingList;
SvxSearchItem* mpOnlineSearchItem;
std::vectorsd::FrameView* maFrameViewList;
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 8b47fe7..c47e934 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -152,7 +152,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
, mpOutliner(NULL)
, mpInternalOutliner(NULL)
, mpWorkStartupTimer(NULL)
-, mpOnlineSpellingTimer(NULL)
+, mpOnlineSpellingIdle(NULL)
, mpOnlineSpellingList(NULL)
, mpOnlineSearchItem(NULL)
, mpCustomShowList(NULL)
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index b39b343..74cc2dd 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -724,13 +724,13 @@ sal_uInt16
SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
void SdDrawDocument::StopOnlineSpelling()
{
-if (mpOnlineSpellingTimer mpOnlineSpellingTimer-IsActive())
+if (mpOnlineSpellingIdle mpOnlineSpellingIdle-IsActive())
{
-mpOnlineSpellingTimer-Stop();
+mpOnlineSpellingIdle-Stop();
}
-delete mpOnlineSpellingTimer;
-mpOnlineSpellingTimer = NULL;
+delete mpOnlineSpellingIdle;
+mpOnlineSpellingIdle = NULL;
delete mpOnlineSpellingList;
mpOnlineSpellingList = NULL;
@@ -772,10 +772,10 @@ void SdDrawDocument::StartOnlineSpelling(bool
bForceSpelling)
}
mpOnlineSpellingList-seekShape(0);
-mpOnlineSpellingTimer = new Timer();
-mpOnlineSpellingTimer-SetTimeoutHdl( LINK(this, SdDrawDocument,
OnlineSpellingHdl) );
-mpOnlineSpellingTimer-SetTimeout(250);
-mpOnlineSpellingTimer-Start();
+mpOnlineSpellingIdle = new Idle();
+mpOnlineSpellingIdle-SetIdleHdl( LINK(this, SdDrawDocument,
OnlineSpellingHdl) );
+mpOnlineSpellingIdle-SetPriority(VCL_IDLE_PRIORITY_LOWEST);
+mpOnlineSpellingIdle-Start();
}
}
@@ -860,7 +860,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl)
}
// Continue search
-mpOnlineSpellingTimer-Start();
+mpOnlineSpellingIdle-Start();
}
else
{
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index cc6c788..1364bee 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -32,7 +32,7 @@ QueueProcessor::QueueProcessor (
const bool bDoSuperSampling,
const SharedCacheContext rpCacheContext)
: maMutex(),
- maTimer(),
+ maIdle(),
mnTimeBetweenHighPriorityRequests (10/*ms*/),
mnTimeBetweenLowPriorityRequests (100/*ms*/),
mnTimeBetweenRequestsWhenNotIdle (1000/*ms*/),
@@ -58,8 +58,8 @@ QueueProcessor::QueueProcessor (
if (aTimeBetweenReqeusts.hassal_Int32())
aTimeBetweenReqeusts = mnTimeBetweenRequestsWhenNotIdle;
-maTimer.SetTimeoutHdl (LINK(this,QueueProcessor,ProcessRequestHdl));
-maTimer.SetTimeout (mnTimeBetweenHighPriorityRequests);
+maIdle.SetIdleHdl (LINK(this,QueueProcessor,ProcessRequestHdl));
+maIdle.SetPriority (VCL_IDLE_PRIORITY_REPAINT);
}
QueueProcessor::~QueueProcessor (void)
@@ -70,20 +70,20 @@ void QueueProcessor::Start (int nPriorityClass)
{
if (mbIsPaused)
return;
-if ( ! maTimer.IsActive())
+if ( ! maIdle.IsActive())
{
if (nPriorityClass == 0)
-maTimer.SetTimeout (mnTimeBetweenHighPriorityRequests);
+maIdle.SetPriority (VCL_IDLE_PRIORITY_REPAINT);
else
-maTimer.SetTimeout (mnTimeBetweenLowPriorityRequests);
-maTimer.Start();
+maIdle.SetPriority
[Libreoffice-commits] core.git: configure.ac
configure.ac |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 40e7eecb7efeeb9af59206d7a9c82ac55adf5279 Author: Noel Grandin n...@peralex.com Date: Thu Nov 20 16:02:57 2014 +0200 add sanity checking to --with-iwyu add some error checking so developers like me don't pass an empty --with-iwyu option and get weird compile time error messages. Change-Id: I142a0404db1bce905ce4d791f286d7bfc913078c Reviewed-on: https://gerrit.libreoffice.org/12988 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/configure.ac b/configure.ac index fe56ff3..7d58d67 100644 --- a/configure.ac +++ b/configure.ac @@ -2079,7 +2079,7 @@ AC_ARG_WITH(gssapi, AC_ARG_WITH(iwyu, AS_HELP_STRING([--with-iwyu], -[Provide IWYU binary path to check unneeded includes instead of building. +[Use given IWYU binary path to check unneeded includes instead of building. Use only if you are hacking on it.]), ,) @@ -12512,6 +12512,12 @@ AC_SUBST(PARALLELISM) IWYU_PATH=$with_iwyu AC_SUBST(IWYU_PATH) +if test ! -z $IWYU_PATH; then +if test ! -f $IWYU_PATH; then +AC_MSG_ERROR([cannot find include-what-you-use binary specified by --with-iwyu]) +fi +fi + # # Set up ILIB for MSVC build # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fix the bug for inverted arrow key behavior in left to right vertical text
Hi all
The behavior of arrow key (left and right) is incorrect when typing left to
right vertical text (Mongolian).
If press left key the caret will move to right line, and if press right key
the caret will move to left line.
I have reported this bug already at here
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=82795
I found that the source code contrlling the behavior of arrow keys is in
this file
sw\source\core\uibase\docvw\edtwin.cxx
the function is
void SwEditWin::KeyInput(const KeyEvent rKEvt)
For fix this issue, I think the code should be change to below
if( ( bVertText ( !bTblCrsr || bVertTable ) ) ||
( bTblCrsr bVertTable ) )
{
bool *bIsTblr*;//how to detect text direction??
// Attempt to integrate cursor travelling for mongolian layout does
not work.
// Thus, back to previous mapping of cursor keys to direction keys.
if( KEY_UP == nKey ) nKey = KEY_LEFT;
else if( KEY_DOWN == nKey ) nKey = KEY_RIGHT;
//
else if( KEY_LEFT == nKey )
nKey = *bIsTblr *? KEY_UP : KEY_DOWN;
else if( KEY_RIGHT == nKey )
nKey = *bIsTblr *? KEY_DOWN : KEY_UP;
//
}
But I don't know how to detect the text direction (*bIsTblr *) at here. Can
anybody help me?
Best regards
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |6 -- 1 file changed, 6 deletions(-) New commits: commit 9ae034bb49642c276c5b2a963bd28e50b9ab4146 Author: Tor Lillqvist t...@collabora.com Date: Fri Nov 21 10:36:13 2014 +0200 Bin --enable-macosx-retina which is a no-op Change-Id: I74ec16b1face24cf6702cc4385606fff420743ae diff --git a/configure.ac b/configure.ac index 7d58d67..dc9ce45 100644 --- a/configure.ac +++ b/configure.ac @@ -1317,12 +1317,6 @@ AC_ARG_ENABLE(silent-msi, [Enable MSI with LIMITUI=1 (silent install).]), ,) -AC_ARG_ENABLE(macosx-retina, -AS_HELP_STRING([--enable-macosx-retina], -[deprecated... enabled by default now. Kept for backward compat only. - ]), -,) - AC_ARG_ENABLE(macosx-code-signing, AS_HELP_STRING([--enable-macosx-code-signing=identity], [Sign executables, dylibs, frameworks and the app bundle. If you ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: fix the bug for inverted arrow key behavior in left to right vertical text
Hi, On Fri, Nov 21, 2014 at 05:50:14PM +0900, Aronsoyol Qi aronsoyol...@gmail.com wrote: But I don't know how to detect the text direction (*bIsTblr *) at here. Can anybody help me? See here for an example on how to detect the vertical, left to right direction: http://opengrok.libreoffice.org/xref/core/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx#829 If you have a layout frame, then pFrm-IsVertical() pFrm-IsVertLR() is your case. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/ElementsDockingWindow.hxx|9 -
starmath/source/ElementsDockingWindow.cxx | 10 --
2 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit fde82414b4c0531c1addcfc99e55ca17d52c3fec
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Sun Nov 16 23:45:14 2014 -0200
Use boost::signal in SmElementsControl
Change-Id: Icb19466db6720350e105b75cb1c0c858f39403ef
Reviewed-on: https://gerrit.libreoffice.org/12509
Reviewed-by: Marcos Paulo de Souza marcos.souza@gmail.com
Tested-by: Marcos Paulo de Souza marcos.souza@gmail.com
diff --git a/starmath/inc/ElementsDockingWindow.hxx
b/starmath/inc/ElementsDockingWindow.hxx
index 73534ef..013b6cd 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_STARMATH_INC_ELEMENTSDOCKINGWINDOW_HXX
#include boost/scoped_ptr.hpp
+#include boost/signals2/signal.hpp
#include sfx2/dockwin.hxx
#include svx/dlgctrl.hxx
#include vcl/scrbar.hxx
@@ -80,8 +81,6 @@ class SmElementsControl : public Control
static const sal_uInt16 aFormats[][2];
static const sal_uInt16 aOthers[][2];
-Link aSelectHdlLink;
-
virtual void Paint(const Rectangle) SAL_OVERRIDE;
virtual void MouseButtonDown(const MouseEvent rMEvt) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent rMEvt ) SAL_OVERRIDE;
@@ -115,10 +114,10 @@ public:
void setVerticalMode(bool bVertical);
-void SetSelectHdl(const Link rLink) { aSelectHdlLink = rLink; }
-
DECL_LINK( ScrollHdl, void* );
void DoScroll(long nDelta);
+
+boost::signals2::signal void ( SmElement* ) selectedSignal;
};
class SmElementsDockingWindow : public SfxDockingWindow
@@ -131,7 +130,7 @@ class SmElementsDockingWindow : public SfxDockingWindow
virtual void Resize() SAL_OVERRIDE;
SmViewShell* GetView();
-DECL_LINK(SelectClickHdl, SmElement*);
+void SelectClickHandler(SmElement* pElement);
DECL_LINK(ElementSelectedHandle, ListBox*);
public:
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index 4b2cd4a..e229828 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -415,7 +415,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent
rMouseEvent)
Rectangle rect(element-mBoxLocation, element-mBoxSize);
if (rect.IsInside(rMouseEvent.GetPosPixel()))
{
-aSelectHdlLink.Call(element);
+selectedSignal(element);
return;
}
}
@@ -650,13 +650,12 @@
SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
}
maElementListBox.SetSelectHdl(LINK(this, SmElementsDockingWindow,
ElementSelectedHandle));
+
maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
maElementsControl.SetBackground( Color( COL_WHITE ) );
maElementsControl.SetTextColor( Color( COL_BLACK ) );
-maElementsControl.SetSelectHdl(LINK(this, SmElementsDockingWindow,
SelectClickHdl));
-
-
maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
maElementsControl.setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
+maElementsControl.selectedSignal.connect( boost::bind(
SmElementsDockingWindow::SelectClickHandler, this, _1 ) );
FreeResource();
}
@@ -682,7 +681,7 @@ void SmElementsDockingWindow::EndDocking( const Rectangle
rReactangle, bool bFl
maElementsControl.setVerticalMode(bVertical);
}
-IMPL_LINK( SmElementsDockingWindow, SelectClickHdl, SmElement*, pElement)
+void SmElementsDockingWindow::SelectClickHandler( SmElement* pElement )
{
SmViewShell* pViewSh = GetView();
@@ -692,7 +691,6 @@ IMPL_LINK( SmElementsDockingWindow, SelectClickHdl,
SmElement*, pElement)
SID_INSERTCOMMANDTEXT, SfxCallMode::RECORD,
new SfxStringItem(SID_INSERTCOMMANDTEXT, pElement-getText()), 0L);
}
-return 0;
}
IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox*, pList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sdmetitm.hxx |2 +-
svx/source/svdraw/svdfmtf.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 226e0abd2c5ebd9fd591966b584d04e4ab5cd171
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 11:05:46 2014 +0100
More fixes after SdrMetricItem changes
...like e0c2ea6bde31bd68e1794154b72fddcd40dda7f9 Consistency around
SdrMetricItem in svx/sderitm.hxx, similar to recent
c3a9a9542b018f781ee12e6c8c943d4f19641afe that's not right anyway, using the
Distance as a which-id.
Should all be found and fixed now with the removal of the unnecessary but
harmful default value from the two-argument SdrMetricItem ctor.
Change-Id: I6eaeb6633c9a350b18e02d476d2c8794a733cea8
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index ece56a6..0e2766f 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
TYPEINFO_OVERRIDE();
SdrMetricItem(): SfxInt32Item() {}
-SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {}
+SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {}
SdrMetricItem(sal_uInt16 nId, SvStream rIn): SfxInt32Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream rIn, sal_uInt16 nVer) const
SAL_OVERRIDE;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index a457b22..12c19db 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -735,7 +735,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction
rAct)
long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2;
if (nRad!=0) {
SfxItemSet aSet(*mpLineAttr-GetPool(), SDRATTR_ECKENRADIUS,
SDRATTR_ECKENRADIUS, 0, 0);
-aSet.Put(SdrMetricItem(nRad));
+aSet.Put(SdrMetricItem(SDRATTR_ECKENRADIUS, nRad));
pRect-SetMergedItemSet(aSet);
}
InsertObj(pRect);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/uibase/shells/textfld.cxx | 23 +--
1 file changed, 17 insertions(+), 6 deletions(-)
New commits:
commit f4309a2c56bfbfe536d95e6692fe9da99774453f
Author: Maxim Monastirsky momonas...@gmail.com
Date: Fri Nov 21 00:50:18 2014 +0200
fdo#78980 i#98931 Accept args for .uno:InsertAnnotation
Change-Id: I27b1b966135767d204a11a9d9f38ad6cc943ee61
(cherry picked from commit 917c52f3219149741199015fce1740c5b13d814e)
diff --git a/sw/source/uibase/shells/textfld.cxx
b/sw/source/uibase/shells/textfld.cxx
index 10575a7..e4ba7d8 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -376,11 +376,22 @@ void SwTextShell::ExecField(SfxRequest rReq)
bool bNew = !(pPostIt pPostIt-GetTyp()-Which() ==
RES_POSTITFLD);
if (bNew || GetView().GetPostItMgr()-IsAnswer())
{
-SvtUserOptions aUserOpt;
+SFX_REQUEST_ARG( rReq, pAuthorItem, SvxPostItAuthorItem,
SID_ATTR_POSTIT_AUTHOR, false );
OUString sAuthor;
-if( (sAuthor = aUserOpt.GetFullName()).isEmpty())
-if( (sAuthor = aUserOpt.GetID()).isEmpty() )
-sAuthor = SW_RES( STR_REDLINE_UNKNOWN_AUTHOR );
+if ( pAuthorItem )
+sAuthor = pAuthorItem-GetValue();
+else
+{
+SvtUserOptions aUserOpt;
+if( (sAuthor = aUserOpt.GetFullName()).isEmpty())
+if( (sAuthor = aUserOpt.GetID()).isEmpty() )
+sAuthor = SW_RES( STR_REDLINE_UNKNOWN_AUTHOR );
+}
+
+SFX_REQUEST_ARG( rReq, pTextItem, SvxPostItTextItem,
SID_ATTR_POSTIT_TEXT, false );
+OUString sText;
+if ( pTextItem )
+sText = pTextItem-GetValue();
if ( rSh.HasSelection() !rSh.IsTableMode() )
{
@@ -391,14 +402,14 @@ void SwTextShell::ExecField(SfxRequest rReq)
// -- suggestion has to be removed before
GetView().GetEditWin().StopQuickHelp();
-SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor,
OUString(), 0);
+SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, sText,
0);
aFldMgr.InsertFld( aData );
rSh.Push();
rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, false);
pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
rSh.Pop(false); // Restore cursor position
- }
+}
if (pPostIt)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Makefile.in
Makefile.in | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit b02fe06a51b798fdf2c5eeb8f421a93f1860b2a8 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 21 11:45:16 2014 +0100 Call all executables in solenv/bin/ with full path Change-Id: Ib8db64b9d8ff131b5b7cadea434681a825c967e7 diff --git a/Makefile.in b/Makefile.in index 22d8a01..2f8de5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -257,7 +257,7 @@ cross-toolset: bootstrap fetch define gb_Top_DoInstall echo $(1) in $(INSTALLDIR) ... \ -ooinstall $(2) $(INSTALLDIR) +$(SRCDIR)/solenv/bin/ooinstall $(2) $(INSTALLDIR) endef @@ -295,9 +295,9 @@ test-install: build ifeq ($(OS_FOR_BUILD),WNT) cd $(SRCDIR)/instsetoo_native $(MAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS) else - @ooinstall $(TESTINSTALLDIR) + @$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR) ifneq ($(MACOSX_CODESIGNING_IDENTITY),) - @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app + @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif endif @$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR)) @@ -321,16 +321,16 @@ install-package-%: $(MAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ id: - @create-ids + @$(SRCDIR)/solenv/bin/create-ids tags: - @create-tags + @$(SRCDIR)/solenv/bin/create-tags etags: - @create-tags -e + @$(SRCDIR)/solenv/bin/create-tags -e docs: - @mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg + @$(SRCDIR)/solenv/bin/mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg findunusedcode: @$(SRCDIR)/bin/findunusedcode $(SRCDIR) $(MAKE) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 - 1 file changed, 1 deletion(-) New commits: commit 111e1e6a46b0618595882504eee0f52cf9822a12 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 21 11:47:45 2014 +0100 There should be no more need for solenv/bin in PATH ...since b02fe06a51b798fdf2c5eeb8f421a93f1860b2a8 Call all executables in solenv/bin/ with full path Change-Id: I0d4df52d9dcc0943ce4bcb197942e745c759ddbb diff --git a/configure.ac b/configure.ac index dc9ce45..dae04ce 100644 --- a/configure.ac +++ b/configure.ac @@ -12767,7 +12767,6 @@ else ;; esac -pathmunge $SRC_ROOT/solenv/bin before pathmunge . before fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 -- 1 file changed, 2 deletions(-) New commits: commit 440b8a0d2ec7122ce54a9436b798a0ee91569205 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 21 11:49:15 2014 +0100 There is hopefully no need for . on PATH? Change-Id: If8deee51d8549314a650991e27069b5f5e9d15f1 diff --git a/configure.ac b/configure.ac index dae04ce..8f29ed6 100644 --- a/configure.ac +++ b/configure.ac @@ -12766,8 +12766,6 @@ else fi ;; esac - -pathmunge . before fi AC_SUBST(LO_PATH) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/node.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 43f98495b5d0756fc37eef99efba45e388101a1a
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Fri Nov 21 11:55:35 2014 +0100
do not use sal_uInt16 for indexing stl vector
Change-Id: I1a0087211bfd4d73cd5af781f5f3117b440fb188
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 2103ffd..9f72b91 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -509,9 +509,8 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
// Find the right Anchor first
const SwFrmFmt* pFmt = 0;
const SwFrmFmts rFmts = *pDoc-GetSpzFrmFmts();
-sal_uInt16 n;
-for( n = 0; n rFmts.size(); ++n )
+for( size_t n = 0; n rFmts.size(); ++n )
{
const SwFrmFmt* pFrmFmt = rFmts[ n ];
const SwFmtCntnt rCntnt = pFrmFmt-GetCntnt();
@@ -534,6 +533,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
while( pFlyNd )
{
// Get up through the Anchor
+size_t n;
for( n = 0; n rFmts.size(); ++n )
{
const SwFrmFmt* pFrmFmt = rFmts[ n ];
@@ -635,7 +635,7 @@ const SwPageDesc* SwNode::FindPageDesc( bool bCalcLay,
// the Anchor can only be in the Body text
const SwTxtFtn* pTxtFtn;
const SwFtnIdxs rFtnArr = pDoc-GetFtnIdxs();
-for( sal_uInt16 n = 0; n rFtnArr.size(); ++n )
+for( size_t n = 0; n rFtnArr.size(); ++n )
if( 0 != ( pTxtFtn = rFtnArr[ n ])-GetStartNode()
(SwNode*)pSttNd ==
pTxtFtn-GetStartNode()-GetNode() )
@@ -714,7 +714,7 @@ SwFrmFmt* SwNode::GetFlyFmt() const
{
// The hard way through the Doc is our last way out
const SwFrmFmts rFrmFmtTbl = *GetDoc()-GetSpzFrmFmts();
-for( sal_uInt16 n = 0; n rFrmFmtTbl.size(); ++n )
+for( size_t n = 0; n rFrmFmtTbl.size(); ++n )
{
SwFrmFmt* pFmt = rFrmFmtTbl[n];
const SwFmtCntnt rCntnt = pFmt-GetCntnt();
@@ -1756,7 +1756,7 @@ bool SwCntntNode::IsAnyCondition( SwCollCondition rTmp )
const
const SwTxtFtn* pTxtFtn;
const SwNode* pSrchNd = pSttNd;
-for( sal_uInt16 n = 0; n rFtnArr.size(); ++n )
+for( size_t n = 0; n rFtnArr.size(); ++n )
if( 0 != ( pTxtFtn = rFtnArr[ n ])-GetStartNode()
pSrchNd == pTxtFtn-GetStartNode()-GetNode()
)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/profile.cxx | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 2d9cf432f683cea56ff3dcb7298098b026eed2d7
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 11:59:55 2014 +0100
cid#1255386: Unchecked return value
Change-Id: Id55f27a3e1a35d1c5ebeccdd9a853f661b5c1746
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 6c54f6a..088a261 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -135,11 +135,13 @@ static oslProfile SAL_CALL osl_psz_openProfile(const
sal_Char *pszProfileName, o
oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName,
oslProfileOption Options)
{
char profilePath[PATH_MAX] = ;
-
-if ( ustrProfileName != 0 ustrProfileName-buffer[0] != 0 )
-FileURLToPath( profilePath, PATH_MAX, ustrProfileName );
-
-return osl_psz_openProfile( profilePath,Options );
+return
+(ustrProfileName == nullptr
+ || ustrProfileName-buffer[0] == 0
+ || (FileURLToPath(profilePath, PATH_MAX, ustrProfileName)
+ == osl_File_E_None))
+? osl_psz_openProfile(profilePath, Options)
+: nullptr;
}
static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName,
oslProfileOption Flags)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/process.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit d2e7105fa3fa696c51965f5e186d64a91416af63
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 12:10:55 2014 +0100
cid#1209049: Unchecked return value
Change-Id: I7422cb010c38de34a7effa6124c5146f70419f79
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 7355ac97..8030664 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -472,7 +472,15 @@ oslProcessError SAL_CALL
osl_executeProcess_WithRedirectedIO(
char szWorkDir[PATH_MAX] = ;
if ( ustrWorkDir != 0 ustrWorkDir-length )
{
-FileURLToPath( szWorkDir, PATH_MAX, ustrWorkDir );
+oslFileError e = FileURLToPath( szWorkDir, PATH_MAX, ustrWorkDir );
+if (e != osl_File_E_None)
+{
+SAL_INFO(
+sal.osl,
+FileURLToPath( rtl::OUString::unacquired(ustrWorkDir)
+ ) failed with e);
+return osl_Process_E_Unknown;
+}
pszWorkDir = szWorkDir;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - cui/uiconfig drawinglayer/source include/vcl svtools/source vcl/inc vcl/source
cui/uiconfig/ui/optmemorypage.ui|9 +
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 10 -
include/vcl/graph.hxx |6
svtools/source/graphic/grfcache.cxx |3
svtools/source/graphic/grfmgr2.cxx | 11 -
vcl/inc/impgraph.hxx|7
vcl/source/gdi/graph.cxx| 15 --
vcl/source/gdi/impgraph.cxx | 119 +---
vcl/source/opengl/OpenGLContext.cxx | 28 ++-
9 files changed, 76 insertions(+), 132 deletions(-)
New commits:
commit a87b1b07b91960601c7f39e2b40eba8ad50b1667
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Nov 21 11:08:13 2014 +0100
Don't use a hard coded limit for size based auto swap out.
Now the graphic cache settings shows the real memory usage for
the users, so we can bequeth the decision of the limit to them.
Default is 200 MB.
See also:
dbdacc73ae154237314d599194cc686bd738a9bf
Change-Id: I463d31254f6f1836e1584d5acd692f38a97bfe39
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index 3b6a738..f469623 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -200,15 +200,8 @@ namespace
void GraphicManager::ImplCheckSizeOfSwappedInGraphics(const GraphicObject*
pGraphicToIgnore)
{
// detect maximum allowed memory footprint. Use the user-settings of
MaxCacheSize (defaulted
-// to 200MB). Limit to a useful maximum for 32Bit address space
-
-// max at 500MB; I experimented with 800 for debug and 750 for non-debug
settings (pics start
-// missing when office reaches a mem footprint of 1.5GB) but some secure
left over space for
-// app activity is needed
-static sal_uLong aMaxSize32Bit(500 * 1024 * 1024);
-
-// calc max allowed cache size
-const sal_uLong nMaxCacheSize(::std::min(GetMaxCacheSize(),
aMaxSize32Bit));
+// to 200MB).
+const sal_uLong nMaxCacheSize(GetMaxCacheSize());
if(mnUsedSize nMaxCacheSize)
{
commit 356006b4967fad26c7edd2126860abf01206fdbd
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Nov 21 11:04:37 2014 +0100
Do not limit graphic cache size setting to 256 MB.
Change-Id: I62835721225cc39dd9fd5131843d57497794be95
diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index 4646cda..d17f5ea 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -23,6 +23,13 @@
property name=step_increment1/property
property name=page_increment10/property
/object
+ object class=GtkAdjustment id=adjustment4
+property name=lower1/property
+property name=upper4096/property
+property name=value1/property
+property name=step_increment1/property
+property name=page_increment10/property
+ /object
object class=GtkBox id=OptMemoryPage
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -182,7 +189,7 @@
property name=visibleTrue/property
property name=can_focusTrue/property
property name=invisible_charâ¢/property
-property name=adjustmentadjustment2/property
+property name=adjustmentadjustment4/property
/object
packing
property name=left_attach1/property
commit c35fae3f6b15221701cadfca3132803695607660
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Nov 20 12:25:16 2014 +0100
fdo#81643: Regression in rendering of borders
Regerssion from:
6a3fb868b2b8af21f7b6140424b6f8377599a786
The new tryDrawBorderLinePrimitive2DDirect() draws rectangles, but
borders are assumed to be trapezoids. So simple comment this
out and use the original drawing method.
Change-Id: I755d5f0b3621bfc4c999ee994a375d4e5ebbcdf0
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index d287739..3ad7aba 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -275,7 +275,7 @@ namespace drawinglayer
return bTryWorked;
}
-
+/*
bool VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(
const drawinglayer::primitive2d::BorderLinePrimitive2D rSource)
{
@@ -610,7 +610,7 @@ namespace drawinglayer
}
return false;
}
-
+*/
void VclPixelProcessor2D::processBasePrimitive2D(const
primitive2d::BasePrimitive2D rCandidate)
{
switch(rCandidate.getPrimitive2DID())
@@ -1226,10 +1226,10 @@ namespace drawinglayer
sal_uInt16 nAntiAliasing =
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/pipe.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 2975abf7964de1f4b705204caac722b3ea69cb8b
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 12:29:24 2014 +0100
Silence false cid#1255391 TOCTOU warning
Change-Id: Ifc35c379d5c68fb363ae3507ccb5bff37c8cd9aa
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index b1b5a76..ecddb66 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -311,6 +311,10 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
if ( listen(pPipe-m_Socket, 5) 0 )
{
OSL_TRACE(osl_createPipe failed to listen. Errno: %d;
%s,errno,strerror(errno));
+// coverity[toctou] cid#1255391 warns about unlink(name) after
+// stat(name, status) above, but the intervening call to bind
makes
+// those two clearly unrelated, as it would fail if name existed at
+// that point in time:
unlink(name); /* remove filesystem entry */
close (pPipe-m_Socket);
__osl_destroyPipeImpl(pPipe);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/source
registry/source/regimpl.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit e3d76b24e43b9e43580814523e8a1c60cbbca731
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 12:35:11 2014 +0100
Silence unhelpful cid#1215304 untrusted loop bound warnings
Change-Id: If4db6a631ad6b24ca6ecfef81a0a20b766ed6324
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 3d44092..3781309 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -326,6 +326,8 @@ void dumpType(typereg::Reader const reader, OString const
indent) {
printf(
%sparameter count: %u\n, indent.getStr(),
static_cast unsigned int
(reader.getMethodParameterCount(i)));
+// coverity[tainted_data] cid#1215304 unhelpfully warns about an
+// untrusted loop bound here:
for (sal_uInt16 j = 0; j reader.getMethodParameterCount(i); ++j)
{
printf(
@@ -366,6 +368,8 @@ void dumpType(typereg::Reader const reader, OString const
indent) {
printf(
%sexception count: %u\n, indent.getStr(),
static_cast unsigned int
(reader.getMethodExceptionCount(i)));
+// coverity[tainted_data] cid#1215304 unhelpfully warns about an
+// untrusted loop bound here:
for (sal_uInt16 j = 0; j reader.getMethodExceptionCount(i); ++j)
{
printf(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoidl/source
unoidl/source/legacyprovider.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit b296006f44d2c248547596698717fd544e49fc64
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 12:41:17 2014 +0100
Silence unhelpful cid#1213376 untrusted loop bound warnings
Change-Id: I0a1fcebb268bea942d4bc2d6bf835c3ffb24df3e
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 9db8495..cad04e6 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -262,6 +262,9 @@ rtl::Reference Entity readEntity(
{
sal_uInt16 m
= reader.getMethodExceptionCount(k);
+// coverity[tainted_data] cid#1213376
+// unhelpfully warns about an untrusted loop
+// bound here:
for (sal_uInt16 l = 0; l != m; ++l) {
getExcs.push_back(
reader.getMethodExceptionTypeName(k,
l).
@@ -273,6 +276,9 @@ rtl::Reference Entity readEntity(
{
sal_uInt16 m
= reader.getMethodExceptionCount(k);
+// coverity[tainted_data] cid#1213376
+// unhelpfully warns about an untrusted loop
+// bound here:
for (sal_uInt16 l = 0; l != m; ++l) {
setExcs.push_back(
reader.getMethodExceptionTypeName(k,
l).
@@ -307,6 +313,8 @@ rtl::Reference Entity readEntity(
std::vector InterfaceTypeEntity::Method::Parameter
params;
sal_uInt16 m = reader.getMethodParameterCount(j);
+// coverity[tainted_data] cid#1213376 unhelpfully warns
+// about an untrusted loop bound here:
for (sal_uInt16 k = 0; k != m; ++k) {
RTParamMode mode = reader.getMethodParameterFlags(j,
k);
InterfaceTypeEntity::Method::Parameter::Direction dir;
@@ -339,6 +347,8 @@ rtl::Reference Entity readEntity(
}
std::vector OUString excs;
m = reader.getMethodExceptionCount(j);
+// coverity[tainted_data] cid#1213376 unhelpfully warns
+// about an untrusted loop bound here:
for (sal_uInt16 k = 0; k != m; ++k) {
excs.push_back(
reader.getMethodExceptionTypeName(j, k).replace(
@@ -613,6 +623,8 @@ rtl::Reference Entity readEntity(
SingleInterfaceBasedServiceEntity::Constructor::
Parameter params;
sal_uInt16 m = reader.getMethodParameterCount(j);
+// coverity[tainted_data] cid#1213376 unhelpfully warns
+// about an untrusted loop bound here:
for (sal_uInt16 k = 0; k != m; ++k) {
RTParamMode mode
= reader.getMethodParameterFlags(j, k);
@@ -653,6 +665,8 @@ rtl::Reference Entity readEntity(
}
std::vector OUString excs;
m = reader.getMethodExceptionCount(j);
+// coverity[tainted_data] cid#1213376 unhelpfully warns
+// about an untrusted loop bound here:
for (sal_uInt16 k = 0; k != m; ++k) {
excs.push_back(
reader.getMethodExceptionTypeName(j,
k).replace(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 734f30484221e091669cfdb45c144084a1377998
Author: Tor Lillqvist t...@collabora.com
Date: Fri Nov 21 13:46:26 2014 +0200
WaE: unused functions
Change-Id: I7c91c90341c9aec75c096d400602877f61f04171
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 3ad7aba..f52f562 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -62,6 +62,8 @@ using namespace com::sun::star;
namespace {
+/* commented out because the only use of thse are in another commented-out
block
+
basegfx::B2DPolygon makeRectPolygon( double fX, double fY, double fW, double
fH )
{
basegfx::B2DPolygon aPoly;
@@ -85,6 +87,7 @@ void drawHairLine(
pOutDev-SetLineColor(Color(rColor));
pOutDev-DrawPolyLine(aTarget);
}
+*/
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: 2 commits - src/lib
src/lib/CDRParser.cpp |4 1 file changed, 4 insertions(+) New commits: commit 6d7de600e938543448f680cc840211f52bb0b848 Author: David Tardon dtar...@redhat.com Date: Fri Nov 21 12:33:26 2014 +0100 avoid extra big allocation, continued Change-Id: I6cf7c2535e1a4b8163413c1826535b856587bc00 diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index d83c4c3..f3e4aeb 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -3239,6 +3239,8 @@ void libcdr::CDRParser::readStyd(librevenge::RVNGInputStream *input) long startPosition = input-tell(); unsigned chunkLength = readUnsigned(input); unsigned numOfArgs = readUnsigned(input); + if (numOfArgs chunkLength / 4) // avoid extra big allocation in case of a broken file +numOfArgs = chunkLength / 4; unsigned startOfArgs = readUnsigned(input); unsigned startOfArgTypes = readUnsigned(input); CDRCharacterStyle charStyle; commit bc3c34481e731d2e696498d19ad5d15b5658afb8 Author: David Tardon dtar...@redhat.com Date: Fri Nov 21 12:30:52 2014 +0100 avoid extra big allocation, continued Change-Id: I0e277d9cb47d9e6bf007b7a4668be339f2884b25 diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index 2b70a2c..d83c4c3 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -1637,6 +1637,8 @@ void libcdr::CDRParser::readTrfd(librevenge::RVNGInputStream *input, unsigned le long startPosition = input-tell(); unsigned chunkLength = readUnsigned(input); unsigned numOfArgs = readUnsigned(input); + if (numOfArgs length / 4) // avoid extra big allocation in case of a broken file +numOfArgs = length / 4; unsigned startOfArgs = readUnsigned(input); std::vectorunsigned argOffsets(numOfArgs, 0); unsigned i = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 13 commits - basic/source filter/source package/source rsc/source sd/inc sd/source svtools/qa vcl/opengl vcl/source
basic/source/runtime/methods.cxx|5 ++--
filter/source/graphicfilter/ipict/ipict.cxx | 27 +
package/source/zipapi/ZipFile.cxx |2 +
rsc/source/rscpp/cpp3.c |1
sd/inc/sdmod.hxx|2 -
sd/source/ui/app/sdmod1.cxx |4 +--
svtools/qa/unit/GraphicObjectTest.cxx |1
vcl/opengl/gdiimpl.cxx |3 ++
vcl/source/fontsubset/sft.cxx | 30 +---
vcl/source/gdi/impfont.cxx |8 +--
10 files changed, 65 insertions(+), 18 deletions(-)
New commits:
commit fcf43d7e8a908a303ccae274dcd6668aa93d4d50
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 21 10:40:40 2014 +
coverity#1213367 rework to make comparison to len more clear
Change-Id: I9cb09bfc35f2b04567e52247f8bd1378910aeeb5
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 1e0aa29..2a33640 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -844,7 +844,9 @@ static char *nameExtract( const sal_uInt8* name, int
nTableSize, int n, int dbFl
int len = GetUInt16(name+6, 12 * n + 8, 1);
// sanity check
-if( (len = 0) || ((ptr+len) (name+nTableSize)) )
+const sal_uInt8* end_table = name+nTableSize;
+const int available_space = ptr end_table ? 0 : (end_table - ptr);
+if( (len = 0) || len available_space)
{
if( ucs2result )
*ucs2result = NULL;
commit 46bdfa98c107e0aba92e42b46c0c5a287251017b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 21 10:34:48 2014 +
coverity#1213368 Untrusted value as argument
Change-Id: Ia1bd6464e6d4c6054ca8f2fce792de365984c02e
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 390777e..1e0aa29 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -920,9 +920,9 @@ static int findname( const sal_uInt8 *name, sal_uInt16 n,
sal_uInt16 platformID,
static void GetNames(TrueTypeFont *t)
{
const sal_uInt8* table = getTable( t, O_name );
-int nTableSize = getTableSize(t, O_name);
+const sal_uInt32 nTableSize = getTableSize(t, O_name);
-if (nTableSize 4)
+if (nTableSize 6)
{
#if OSL_DEBUG_LEVEL 1
fprintf(stderr, O_name table too small\n);
@@ -931,13 +931,17 @@ static void GetNames(TrueTypeFont *t)
}
sal_uInt16 n = GetUInt16(table, 2, 1);
-int i, r;
-bool bPSNameOK = true;
-/* #129743# simple sanity check for name table entry count */
-if( nTableSize = n * 12 + 6 )
+/* simple sanity check for name table entry count */
+const size_t nMinRecordSize = 12;
+const size_t nSpaceAvailable = nTableSize - 6;
+const size_t nMaxRecords = nSpaceAvailable/nMinRecordSize;
+if (n = nMaxRecords)
n = 0;
+int i, r;
+bool bPSNameOK = true;
+
/* PostScript name: preferred Microsoft */
t-psname = NULL;
if ((r = findname(table, n, 3, 1, 0x0409, 6)) != -1)
commit b3c282f12931b7e1cf152cb39664e3139012d7d0
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 21 10:26:51 2014 +
move error patch test to start
Change-Id: Icd6a8b301eb7cc53aac9b84d2208bcde94218470
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 2d52a19..390777e 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -879,12 +879,12 @@ static char *nameExtract( const sal_uInt8* name, int
nTableSize, int n, int dbFl
static int findname( const sal_uInt8 *name, sal_uInt16 n, sal_uInt16
platformID,
sal_uInt16 encodingID, sal_uInt16 languageID, sal_uInt16 nameID )
{
+if (n == 0) return -1;
+
int l = 0, r = n-1, i;
sal_uInt32 t1, t2;
sal_uInt32 m1, m2;
-if (n == 0) return -1;
-
m1 = (platformID 16) | encodingID;
m2 = (languageID 16) | nameID;
commit 6027c7575bc7b8821a60bad3b70c237cae69ed72
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 21 10:19:53 2014 +
coverity#1213370 rework to make comparison to rec[i].slen more clear
Change-Id: I13ff12f0023b2752ea40cbf941350ca4c7dc7f78
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 4cdb95c..2d52a19 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2716,9 +2716,11 @@ int GetTTNameRecords(TrueTypeFont *ttf, NameRecord **nr)
continue;
}
-const sal_uInt8* rec_string = table + nStrBase + nStrOffset;
+const sal_uInt8* rec_string = table + nStrBase + nStrOffset;
// sanity check
-if( rec_string (sal_uInt8*)ttf-ptr rec_string
((sal_uInt8*)ttf-ptr + ttf-fsize - rec[i].slen ) )
+const sal_uInt8* end_table = ttf-ptr + ttf-fsize;
+const size_t available_space = rec_string end_table ? 0 :
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 82e5f287cc278781cdedee0d92fb4ce17cbc42bc
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 12:50:30 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I17ea9518e862b8c97c4c3f4564caedf9d045b7b3
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d120db3..c4a7934 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -57,7 +57,7 @@ protected:
protected:
bool CjkNumberedListTestHelper(sal_Int16 nValue)
{
-bool isNumber;
+bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Reference beans::XPropertySet properties( xPara,
uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e934ca0c21d390204e490ce92c9740930d50ba60
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 12:50:30 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I17ea9518e862b8c97c4c3f4564caedf9d045b7b3
(cherry picked from commit 82e5f287cc278781cdedee0d92fb4ce17cbc42bc)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d120db3..c4a7934 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -57,7 +57,7 @@ protected:
protected:
bool CjkNumberedListTestHelper(sal_Int16 nValue)
{
-bool isNumber;
+bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Reference beans::XPropertySet properties( xPara,
uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/uiconfig officecfg/registry
basctl/uiconfig/basicide/ui/defaultlanguage.ui| 28 - basctl/uiconfig/basicide/ui/dialogpage.ui | 20 - basctl/uiconfig/basicide/ui/exportdialog.ui | 102 ++--- basctl/uiconfig/basicide/ui/gotolinedialog.ui | 89 ++-- basctl/uiconfig/basicide/ui/importlibdialog.ui| 14 basctl/uiconfig/basicide/ui/libpage.ui| 28 - basctl/uiconfig/basicide/ui/managebreakpoints.ui | 194 -- basctl/uiconfig/basicide/ui/managelanguages.ui| 16 basctl/uiconfig/basicide/ui/modulepage.ui | 20 - basctl/uiconfig/basicide/ui/newlibdialog.ui | 87 ++-- basctl/uiconfig/basicide/ui/organizedialog.ui |5 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |2 12 files changed, 263 insertions(+), 342 deletions(-) New commits: commit dca47c4774a8373a7389268e3123bf8ebcf109c3 Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Nov 19 11:54:23 2014 -0600 HIG fixes for basctl And a menu item and dialog rename: Goto Line (Number) â Go to Line Change-Id: I5889486ddd7925a9ade889787889a9b9b6221f39 Reviewed-on: https://gerrit.libreoffice.org/12971 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/basctl/uiconfig/basicide/ui/defaultlanguage.ui b/basctl/uiconfig/basicide/ui/defaultlanguage.ui index b1adb43..e1ff4ba 100644 --- a/basctl/uiconfig/basicide/ui/defaultlanguage.ui +++ b/basctl/uiconfig/basicide/ui/defaultlanguage.ui @@ -1,12 +1,13 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.16.0 on Fri Jan 3 21:18:53 2014 -- +!-- Generated with glade 3.18.3 -- interface - !-- interface-requires gtk+ 3.0 -- - !-- interface-requires LibreOffice 1.0 -- + requires lib=gtk+ version=3.0/ + requires lib=LibreOffice version=1.0/ object class=GtkDialog id=DefaultLanguageDialog property name=can_focusFalse/property property name=border_width6/property property name=title translatable=yesSet Default User Interface Language/property +property name=resizableFalse/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 @@ -59,6 +60,7 @@ property name=expandFalse/property property name=fillTrue/property property name=position2/property +property name=secondaryTrue/property /packing /child /object @@ -88,15 +90,13 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesDefault language/property +property name=label translatable=yesDefault language:/property property name=use_underlineTrue/property property name=mnemonic_widgetentries:border/property /object packing property name=left_attach0/property property name=top_attach0/property -property name=width1/property -property name=height1/property /packing /child child @@ -110,8 +110,6 @@ packing property name=left_attach0/property property name=top_attach2/property -property name=width1/property -property name=height1/property /packing /child child @@ -127,8 +125,6 @@ packing property name=left_attach0/property property name=top_attach3/property -property name=width1/property -property name=height1/property /packing /child child @@ -136,23 +132,19 @@ property name=can_focusFalse/property property name=no_show_allTrue/property property name=xalign0/property -property name=label translatable=yesAvailable Languages/property +property name=label translatable=yesAvailable languages:/property property name=use_underlineTrue/property property name=mnemonic_widgetcheckedentries:border/property /object packing property name=left_attach0/property property name=top_attach1/property -property name=width1/property -
guidance to write a unit test for SetMacroSecurityLevel()
Hi, Can anyone send me how to access and change a level of the MacroSecurityLevel? In qa\xmlsecurity\qa\certext\SanCertExt.cxx there is an example of security for certificates? How do I write someting similar for chaning a Macro Security Level? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
QA Meeting Minutes - 2014-11-19
Hello! This week we had another great QA meeting! We covered a number of different topics, and brainstormed some ideas about how we can encourage better communication, identify potential regressions earlier in the release process, and attack our set of open bugs from a bunch of different angles! :-) Thanks to all of your hard work, we saw another precipitous drop in our UNCONFIRMED bug count this week, dropping below 600 before settling around 615. Getting that number down and *keeping* it down is a really important piece of us being able to respond to new bug reports in a timely fashion. I can't wait to see the numbers in December! All the gory details are available on the wiki/in the meeting notes here: https://wiki.documentfoundation.org/QA/Meetings/2014/November_19 http://pumbaa.documentfoundation.org/meetbot/libreoffice-qa/2014/libreoffice-qa.2014-11-19-18.41.html Our next meeting is in (surprise, surprise!) 2 weeks: https://wiki.documentfoundation.org/QA/Meetings/2014/December_03 Here in the US we'll be celebrating Thanksgiving next week. For all those who live elsewhere in the world, it might be hard find turkey and cranberries in your region, but they're a really delicious combination, especially in a sandwich! To quote the call of the turkey, let's get out there and 'gobble gobble' some bugs! :-) Best, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FDO - New Milestone
[adding QA list back to cc] On Sun, Nov 16, 2014 at 4:50 PM, julien2412 serval2...@yahoo.fr wrote: Hi Joel, Great news indeed. But is there a milestone for : - oldest bugs, there are more than 500 bugs older than 2011-06 (3 years ago!) We've got 564 bugs in that range https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOf1=creation_tslimit=0list_id=495680o1=lessthanorder=changeddate%20DESC%2Cop_sys%2Cbug_status%2Cpriority%2Cassigned_to%2Cbug_idproduct=LibreOfficequery_format=advancedv1=2011-06-01 Of those, 21 are UNCONFIRMED/NEEDINFO (mostly UNCONFIRMED). Older open bugs that aren't yet triaged are definitely on the radar of QA. - bug marked as regression (didn't play with search options to know the number) ? We've got several stats on regressions. We have some in the ESC minutes each week, and we also keep track of stats in the QA minutes: https://wiki.documentfoundation.org/QA/Meetings/2014/December_03#IRC_Minutes I mean, why to focus only about unconfirmed ones even if they're important of course? Oh, certainly -- there a number of different groups of bugs on which we can focus :-) The 'preBibisect' bugs are always a great group to QA to tackle. Currently we have 17 bugs that need sleuthing to figure out where in the [OOo - LO 3.5] range they first appeared, and the OSX bibisect repo is perfect for that purpose: https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=NEEDINFOlist_id=495684product=LibreOfficequery_format=advancedversion=PreBibisect Aside from prioritizing bugs and putting them on MAB lists, is there anything specific QA can do to highlight specific bugs for the devs? Cheers, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
8 new defect(s) introduced to LibreOffice found with Coverity Scan.
38 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 8 of 8 defect(s)
** CID 1255386: Unchecked return value (CHECKED_RETURN)
/sal/osl/unx/profile.cxx: 140 in osl_openProfile()
** CID 1255387: Division or modulo by float zero (DIVIDE_BY_ZERO)
/vcl/opengl/gdiimpl.cxx: 732 in
OpenGLSalGraphicsImpl::DrawTransformedTexture(OpenGLTexture , OpenGLTexture ,
const basegfx::B2DPoint , const basegfx::B2DPoint , const basegfx::B2DPoint
)()
/vcl/opengl/gdiimpl.cxx: 732 in
OpenGLSalGraphicsImpl::DrawTransformedTexture(OpenGLTexture , OpenGLTexture ,
const basegfx::B2DPoint , const basegfx::B2DPoint , const basegfx::B2DPoint
)()
** CID 1255388: Division or modulo by float zero (DIVIDE_BY_ZERO)
/vcl/opengl/gdiimpl.cxx: 732 in
OpenGLSalGraphicsImpl::DrawTransformedTexture(OpenGLTexture , OpenGLTexture ,
const basegfx::B2DPoint , const basegfx::B2DPoint , const basegfx::B2DPoint
)()
/vcl/opengl/gdiimpl.cxx: 732 in
OpenGLSalGraphicsImpl::DrawTransformedTexture(OpenGLTexture , OpenGLTexture ,
const basegfx::B2DPoint , const basegfx::B2DPoint , const basegfx::B2DPoint
)()
** CID 1255389: Dereference null return value (NULL_RETURNS)
/svtools/qa/unit/GraphicObjectTest.cxx: 170 in
unnamed::GraphicObjectTest::testSizeBasedAutoSwap()()
/svtools/qa/unit/GraphicObjectTest.cxx: 170 in
unnamed::GraphicObjectTest::testSizeBasedAutoSwap()()
** CID 1255390: Resource leak (RESOURCE_LEAK)
/basic/source/runtime/methods.cxx: 3733 in SbRtl_Shell(StarBASIC *, SbxArray ,
bool)()
** CID 1255391: Time of check time of use (TOCTOU)
/sal/osl/unx/pipe.cxx: 291 in osl_psz_createPipe(const char *, unsigned int,
void *)()
/sal/osl/unx/pipe.cxx: 314 in osl_psz_createPipe(const char *, unsigned int,
void *)()
** CID 1209008: Unchecked return value (CHECKED_RETURN)
/sd/source/ui/app/sdmod1.cxx: 315 in SdModule::OutlineToImpress(SfxRequest )()
** CID 1209049: Unchecked return value (CHECKED_RETURN)
/sal/osl/unx/process.cxx: 475 in osl_executeProcess_WithRedirectedIO()
*** CID 1255386: Unchecked return value (CHECKED_RETURN)
/sal/osl/unx/profile.cxx: 140 in osl_openProfile()
134
135 oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName,
oslProfileOption Options)
136 {
137 char profilePath[PATH_MAX] = ;
138
139 if ( ustrProfileName != 0 ustrProfileName-buffer[0] != 0 )
CID 1255386: Unchecked return value (CHECKED_RETURN)
Calling FileURLToPath without checking return value (as is done
elsewhere 11 out of 13 times).
140 FileURLToPath( profilePath, PATH_MAX, ustrProfileName );
141
142 return osl_psz_openProfile( profilePath,Options );
143 }
144
145 static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char
*pszProfileName, oslProfileOption Flags)
*** CID 1255387: Division or modulo by float zero (DIVIDE_BY_ZERO)
/vcl/opengl/gdiimpl.cxx: 732 in
OpenGLSalGraphicsImpl::DrawTransformedTexture(OpenGLTexture , OpenGLTexture ,
const basegfx::B2DPoint , const basegfx::B2DPoint , const basegfx::B2DPoint
)()
726 const basegfx::B2DPoint rNull,
727 const basegfx::B2DPoint rX,
728 const basegfx::B2DPoint rY )
729 {
730 const basegfx::B2DVector aXRel = rX - rNull;
731 const basegfx::B2DVector aYRel = rY - rNull;
CID 1255387: Division or modulo by float zero (DIVIDE_BY_ZERO)
In expression (float)aYRel.getY() / rTexture-GetHeight(), division
by expression rTexture-GetHeight() which may be zero has undefined
behavior.
732 const float aValues[] = {
733 (float) aXRel.getX()/rTexture.GetWidth(), (float)
aXRel.getY()/rTexture.GetWidth(), 0, 0,
734 (float) aYRel.getX()/rTexture.GetHeight(), (float)
aYRel.getY()/rTexture.GetHeight(), 0, 0,
735 0, 0,
1, 0,
736 (float) rNull.getX(), (float)
rNull.getY(), 0, 1 };
737 glm::mat4 mMatrix = glm::make_mat4( aValues );
/vcl/opengl/gdiimpl.cxx: 732 in
OpenGLSalGraphicsImpl::DrawTransformedTexture(OpenGLTexture , OpenGLTexture ,
const basegfx::B2DPoint , const basegfx::B2DPoint , const basegfx::B2DPoint
)()
726 const basegfx::B2DPoint rNull,
727 const basegfx::B2DPoint rX,
728 const basegfx::B2DPoint rY )
729 {
730 const basegfx::B2DVector aXRel = rX - rNull;
731 const basegfx::B2DVector aYRel = rY - rNull;
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 305461aafe2527fcf9bf796f59648c81b38d7850
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 07:19:05 2014 -0500
Revert fdo#81643: Regression in rendering of borders
This reverts commit c35fae3f6b15221701cadfca3132803695607660.
One man's feature (with minor issure) is another man's regressions...
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index f52f562..ba78741 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -278,7 +278,7 @@ namespace drawinglayer
return bTryWorked;
}
-/*
+
bool VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(
const drawinglayer::primitive2d::BorderLinePrimitive2D rSource)
{
@@ -613,7 +613,7 @@ namespace drawinglayer
}
return false;
}
-*/
+
void VclPixelProcessor2D::processBasePrimitive2D(const
primitive2d::BasePrimitive2D rCandidate)
{
switch(rCandidate.getPrimitive2DID())
@@ -1229,10 +1229,10 @@ namespace drawinglayer
sal_uInt16 nAntiAliasing =
mpOutputDevice-GetAntialiasing();
mpOutputDevice-SetAntialiasing(nAntiAliasing
~ANTIALIASING_ENABLE_B2DDRAW);
-//const drawinglayer::primitive2d::BorderLinePrimitive2D
rBorder =
-//static_castconst
drawinglayer::primitive2d::BorderLinePrimitive2D(rCandidate);
+const drawinglayer::primitive2d::BorderLinePrimitive2D
rBorder =
+static_castconst
drawinglayer::primitive2d::BorderLinePrimitive2D(rCandidate);
-//if (!tryDrawBorderLinePrimitive2DDirect(rBorder))
+if (!tryDrawBorderLinePrimitive2DDirect(rBorder))
process(rCandidate.get2DDecomposition(getViewInformation2D()));
mpOutputDevice-SetAntialiasing(nAntiAliasing);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 43aa19918a76e09d45071187e3627e3176ded240
Author: Tor Lillqvist t...@collabora.com
Date: Fri Nov 21 14:54:54 2014 +0200
Revert WaE: unused functions
This needs to be reverted, too.
This reverts commit 734f30484221e091669cfdb45c144084a1377998.
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index ba78741..d287739 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -62,8 +62,6 @@ using namespace com::sun::star;
namespace {
-/* commented out because the only use of thse are in another commented-out
block
-
basegfx::B2DPolygon makeRectPolygon( double fX, double fY, double fW, double
fH )
{
basegfx::B2DPolygon aPoly;
@@ -87,7 +85,6 @@ void drawHairLine(
pOutDev-SetLineColor(Color(rColor));
pOutDev-DrawPolyLine(aTarget);
}
-*/
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/svx svx/source
include/svx/sdmetitm.hxx |2 +-
svx/source/svdraw/svdfmtf.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit eef61f54285c718ea78da631ebdd2d806d153fea
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 11:05:46 2014 +0100
More fixes after SdrMetricItem changes
...like e0c2ea6bde31bd68e1794154b72fddcd40dda7f9 Consistency around
SdrMetricItem in svx/sderitm.hxx, similar to recent
c3a9a9542b018f781ee12e6c8c943d4f19641afe that's not right anyway, using the
Distance as a which-id.
Should all be found and fixed now with the removal of the unnecessary but
harmful default value from the two-argument SdrMetricItem ctor.
Change-Id: I6eaeb6633c9a350b18e02d476d2c8794a733cea8
(cherry picked from commit 226e0abd2c5ebd9fd591966b584d04e4ab5cd171)
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index ece56a6..0e2766f 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
TYPEINFO_OVERRIDE();
SdrMetricItem(): SfxInt32Item() {}
-SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {}
+SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {}
SdrMetricItem(sal_uInt16 nId, SvStream rIn): SfxInt32Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream rIn, sal_uInt16 nVer) const
SAL_OVERRIDE;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index a457b22..12c19db 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -735,7 +735,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction
rAct)
long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2;
if (nRad!=0) {
SfxItemSet aSet(*mpLineAttr-GetPool(), SDRATTR_ECKENRADIUS,
SDRATTR_ECKENRADIUS, 0, 0);
-aSet.Put(SdrMetricItem(nRad));
+aSet.Put(SdrMetricItem(SDRATTR_ECKENRADIUS, nRad));
pRect-SetMergedItemSet(aSet);
}
InsertObj(pRect);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Who knows of a free UML tool to work with libreoffice?
___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7171f7920ee2e8d31f51d27eab86305ecf14626e
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 14:12:05 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I5a46eb90749965193d2965740d85a1a2eb1ce641
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 593f01e..12fbfd1 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -54,7 +54,7 @@ public:
bool CjkNumberedListTestHelper(sal_Int16 rValue)
{
-sal_Bool isNumber;
+sal_Bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Referencebeans::XPropertySet properties(xPara, uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ww8export/ww8export.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 04b3a3c801bc452f659048a816829300d6b2a16f
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 14:18:14 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I307af9b8619db00afaef378df60352c06eb1e4c9
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 019c87b..f55967e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -31,7 +31,7 @@ public:
protected:
bool CjkNumberedListTestHelper(sal_Int16 nValue)
{
-bool isNumber;
+bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Reference beans::XPropertySet properties( xPara,
uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sw/qa
sw/qa/extras/rtfexport/rtfexport.cxx |2 +-
sw/qa/extras/ww8export/ww8export.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fa83f3c4636d5dd754f064116900e596dffdb912
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 14:18:14 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I307af9b8619db00afaef378df60352c06eb1e4c9
(cherry picked from commit 04b3a3c801bc452f659048a816829300d6b2a16f)
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 019c87b..f55967e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -31,7 +31,7 @@ public:
protected:
bool CjkNumberedListTestHelper(sal_Int16 nValue)
{
-bool isNumber;
+bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Reference beans::XPropertySet properties( xPara,
uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
commit 45a7a1a44d263d0e61a8251a7587b1dbc1b535dd
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 14:12:05 2014 +0100
WaE: âisNumberâ [-Werror=maybe-uninitialized]
Change-Id: I5a46eb90749965193d2965740d85a1a2eb1ce641
(cherry picked from commit 7171f7920ee2e8d31f51d27eab86305ecf14626e)
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 593f01e..12fbfd1 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -54,7 +54,7 @@ public:
bool CjkNumberedListTestHelper(sal_Int16 rValue)
{
-sal_Bool isNumber;
+sal_Bool isNumber = false;
uno::Referencetext::XTextRange xPara(getParagraph(1));
uno::Referencebeans::XPropertySet properties(xPara, uno::UNO_QUERY);
properties-getPropertyValue(NumberingIsNumber) = isNumber;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablecontroller.cxx | 44 +--
1 file changed, 32 insertions(+), 12 deletions(-)
New commits:
commit e91ab2104b62b689dca2c565cd81a8cb40885822
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 20 15:53:14 2014 +
Resolves: fdo#86466 Wrong background color shown in format table in impress
regression from
commit 440e2031ce8cffc8dc573e359a330236f9c11dfb
bnc#882627: Allow to edit spacing to contents even with no borders
visible.
which was an attempt to fix regression from
commit 9e5342509b302ba1f816f21cc3ad1cb7093982e0
Date: Mon Jun 3 14:22:07 2013 +0200
copy values from the original item set
... because SfxAbstractDialog::GetOutputItemSet() only contains the
items that have been _changed_ in the dialog.
Now format color shows the expected color, and loading the sample for
bnc#882627 and selecting cells and changing the border distance (etc)
doesn't
cause bulleting and paragraph alignment properties to be stripped away
Change-Id: Id414e09faa221d151f393971654b17bbe9f46d81
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index f5b4c99..c028a2a 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -856,6 +856,19 @@ void SvxTableController::onSelect( sal_uInt16 nSId )
}
}
+namespace
+{
+SvxBoxItem mergeDrawinglayerTextDistancesAndSvxBoxItem(const SfxItemSet
rAttrSet)
+{
+// merge drawing layer text distance items into SvxBoxItem used by the
dialog
+SvxBoxItem aBoxItem( static_cast const SvxBoxItem ( rAttrSet.Get(
SDRATTR_TABLE_BORDER ) ) );
+aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(rAttrSet.Get(SDRATTR_TEXT_LEFTDIST)).GetValue()), BOX_LINE_LEFT
);
+aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(rAttrSet.Get(SDRATTR_TEXT_RIGHTDIST)).GetValue()),
BOX_LINE_RIGHT );
+aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(rAttrSet.Get(SDRATTR_TEXT_UPPERDIST)).GetValue()), BOX_LINE_TOP
);
+aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(rAttrSet.Get(SDRATTR_TEXT_LOWERDIST)).GetValue()),
BOX_LINE_BOTTOM );
+return aBoxItem;
+}
+}
void SvxTableController::onFormatTable( SfxRequest rReq )
{
@@ -870,15 +883,11 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
SfxItemSet aNewAttr( pTableObj-GetModel()-GetItemPool() );
// merge drawing layer text distance items into SvxBoxItem used by the
dialog
-SvxBoxItem aBoxItem( static_cast const SvxBoxItem ( aNewAttr.Get(
SDRATTR_TABLE_BORDER ) ) );
-aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST)).GetValue()), BOX_LINE_LEFT
);
-aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST)).GetValue()),
BOX_LINE_RIGHT );
-aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST)).GetValue()), BOX_LINE_TOP
);
-aBoxItem.SetDistance( sal::static_int_cast sal_uInt16 (
static_castconst
SdrMetricItem(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST)).GetValue()),
BOX_LINE_BOTTOM );
+SvxBoxItem
aBoxItem(mergeDrawinglayerTextDistancesAndSvxBoxItem(aNewAttr));
SvxBoxInfoItem aBoxInfoItem( static_cast const SvxBoxInfoItem (
aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) );
-MergeAttrFromSelectedCells(aNewAttr, true);
+MergeAttrFromSelectedCells(aNewAttr, false);
FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem );
aNewAttr.Put( aBoxItem );
aNewAttr.Put( aBoxInfoItem );
@@ -888,8 +897,21 @@ void SvxTableController::onFormatTable( SfxRequest rReq )
// Even Cancel Button is returning positive(101) value,
if( pDlg.get() ( pDlg-Execute() == RET_OK ) )
{
-SfxItemSet aNewSet( aNewAttr );
-aNewSet.Put( *(pDlg-GetOutputItemSet ()) );
+SfxItemSet aNewSet( *(pDlg-GetOutputItemSet ()) );
+
+//Only properties that were unchanged by the dialog appear in this
+//itemset. We had constructed these two properties from other
+//ones, so if they were not changed, then forcible set them back to
+//their originals in the new result set so we can decompose that
+//unchanged state back to their input properties
+if (aNewSet.GetItemState(SDRATTR_TABLE_BORDER, false) !=
SfxItemState::SET)
+{
+aNewSet.Put(aBoxItem);
+}
+if (aNewSet.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) !=
[Libreoffice-commits] core.git: store/workben
store/workben/makefile.mk | 99 ---
store/workben/t_base.cxx | 346 ---
store/workben/t_file.cxx | 211 ---
store/workben/t_leak.cxx | 31 -
store/workben/t_page.cxx | 1355 --
store/workben/t_store.cxx | 543 --
6 files changed, 2585 deletions(-)
New commits:
commit 4ecbc7e63cd0b84ad9310b5206c41ce750f46a57
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 21 14:51:45 2014 +0100
Remvoe store/workben/
...probably not worth dragging that unused code around any more
Change-Id: I4f22a704af862d8a1fe1f2202609f355ccee7c9c
diff --git a/store/workben/makefile.mk b/store/workben/makefile.mk
deleted file mode 100644
index 8805c8e..000
--- a/store/workben/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# 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 .
-#
-
-PRJ=..
-
-PRJNAME=store
-TARGET=workben
-
-LIBTARGET=NO
-TARGETTYPE=CUI
-NO_DEFAULT_STL=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-.IF $(STORELIB) ==
-.IF $(OS) != WNT
-STORELIB= -lstore
-.ELSE # unx
-.IF $(OS)$(COM)==WNTGCC
-STORELIB= -lstore$(UDK_MAJOR)
-.ELSE
-STORELIB= $(LB)$/istore.lib
-.ENDIF
-.ENDIF # unx
-.ENDIF # storelib
-
-.IF $(OS) != WNT
-STOREDBGLIB= $(LB)$/libstoredbg.a
-.ELSE # unx
-.IF $(OS)$(COM)==WNTGCC
-STOREDBGLIB= $(LB)$/libstoredbg.a
-.ELSE
-STOREDBGLIB= $(LB)$/storedbg.lib
-.ENDIF
-.ENDIF # unx
-
-CFLAGS+= -I..$/source
-
-# --- Files ---
-
-OBJFILES= \
-$(OBJ)$/t_leak.obj \
-$(OBJ)$/t_file.obj \
-$(OBJ)$/t_page.obj \
-$(OBJ)$/t_base.obj \
-$(OBJ)$/t_store.obj
-
-APP1TARGET=t_file
-APP1OBJS= $(OBJ)$/t_file.obj
-APP1STDLIBS= $(STOREDBGLIB)
-APP1STDLIBS+= $(SALLIB)
-APP1DEPN= $(STOREDBGLIB)
-APP1RPATH= UREBIN
-
-APP2TARGET=t_page
-APP2OBJS= $(OBJ)$/t_page.obj
-APP2STDLIBS= $(STOREDBGLIB)
-APP2STDLIBS+= $(SALLIB)
-APP2DEPN= $(STOREDBGLIB)
-
-APP3TARGET=t_base
-APP3OBJS= $(OBJ)$/t_base.obj
-APP3STDLIBS= $(STOREDBGLIB)
-APP3STDLIBS+= $(SALLIB)
-APP3DEPN= $(STOREDBGLIB)
-APP3RPATH= UREBIN
-
-APP4TARGET=t_store
-APP4OBJS= $(OBJ)$/t_store.obj
-APP4STDLIBS= $(STORELIB)
-APP4STDLIBS+= $(SALLIB)
-APP4DEPN= $(SLB)$/store.lib
-APP4RPATH= UREBIN
-
- APP5TARGET= t_leak
- APP5OBJS= $(OBJ)$/t_leak.obj
- APP5STDLIBS+= $(SALLIB)
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
diff --git a/store/workben/t_base.cxx b/store/workben/t_base.cxx
deleted file mode 100644
index badefe8..000
--- a/store/workben/t_base.cxx
+++ /dev/null
@@ -1,346 +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 .
- */
-
-#include string.h
-#include sal/types.h
-#include osl/diagnose.h
-#include osl/thread.h
-#include rtl/ustring.hxx
-
-#include object.hxx
-#include storbase.hxx
-#include storbios.hxx
-#include lockbyte.hxx
-
-using namespace store;
-
-#define TEST_PAGESIZE 1024
-
-/*
- *
- * OTestObject.
- *
- *==*/
-class OTestObject : public store::OStoreObject
-{
-public:
-OTestObject (void);
-
-virtual sal_Bool SAL_CALL isKindOf (sal_uInt32 nTypeId);
-
-protected:
-virtual ~OTestObject (void);
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/app.hxx |3 +--
sfx2/source/appl/appquit.cxx |1 +
sfx2/source/appl/childwinimpl.cxx | 35 +++
sfx2/source/appl/childwinimpl.hxx | 19 +++
sfx2/source/appl/module.cxx |1 +
sfx2/source/appl/workwin.cxx |1 +
6 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit 721edde36b98a878a6d0031119fdae74fc6fb010
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 00:01:17 2014 -0500
Forward declare SfxChildWinFactArr_Impl in sfx2/app.hxx.
Change-Id: I52128b405e861551a933d9c1625d7741b43ad2b6
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index b2e5878..d0a0459 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -35,7 +35,6 @@
// header file because in former times SfxApplication was derived from it
#include vcl/svapp.hxx
-#include sfx2/childwin.hxx
#include sfx2/mnuitem.hxx
#include sfx2/shell.hxx
#include sfx2/stbitem.hxx
@@ -56,7 +55,7 @@ class AppSettings;
struct SfxChildWinContextFactory;
class SfxAppData_Impl;
class SfxBindings;
-typedef boost::ptr_vectorSfxChildWinFactory SfxChildWinFactArr_Impl;
+class SfxChildWinFactArr_Impl;
class SfxChildWindow;
class SfxDispatcher;
class SfxEventConfiguration;
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 1fba871..b601bfa 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -53,6 +53,7 @@
#include sfx2/objsh.hxx
#include sfx2/docfac.hxx
#include appbaslib.hxx
+#include childwinimpl.hxx
#include basic/basicmanagerrepository.hxx
#include svtools/svtresid.hxx
diff --git a/sfx2/source/appl/childwinimpl.cxx
b/sfx2/source/appl/childwinimpl.cxx
index 5022fa5..acdc15f 100644
--- a/sfx2/source/appl/childwinimpl.cxx
+++ b/sfx2/source/appl/childwinimpl.cxx
@@ -39,4 +39,39 @@ void SfxChildWinContextArr_Impl::push_back(
SfxChildWinContextFactory* p )
maData.push_back(p);
}
+size_t SfxChildWinFactArr_Impl::size() const
+{
+return maData.size();
+}
+
+const SfxChildWinFactory SfxChildWinFactArr_Impl::operator []( size_t i )
const
+{
+return maData[i];
+}
+
+SfxChildWinFactory SfxChildWinFactArr_Impl::operator []( size_t i )
+{
+return maData[i];
+}
+
+void SfxChildWinFactArr_Impl::push_back( SfxChildWinFactory* p )
+{
+maData.push_back(p);
+}
+
+void SfxChildWinFactArr_Impl::erase( iterator it )
+{
+maData.erase(it);
+}
+
+SfxChildWinFactArr_Impl::iterator SfxChildWinFactArr_Impl::begin()
+{
+return maData.begin();
+}
+
+SfxChildWinFactArr_Impl::const_iterator SfxChildWinFactArr_Impl::begin() const
+{
+return maData.begin();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/childwinimpl.hxx
b/sfx2/source/appl/childwinimpl.hxx
index 5095de4..8b414e7 100644
--- a/sfx2/source/appl/childwinimpl.hxx
+++ b/sfx2/source/appl/childwinimpl.hxx
@@ -36,6 +36,25 @@ public:
void push_back( SfxChildWinContextFactory* p );
};
+class SfxChildWinFactArr_Impl
+{
+typedef boost::ptr_vectorSfxChildWinFactory DataType;
+DataType maData;
+
+public:
+typedef DataType::iterator iterator;
+typedef DataType::const_iterator const_iterator;
+
+size_t size() const;
+const SfxChildWinFactory operator []( size_t i ) const;
+SfxChildWinFactory operator []( size_t i );
+void push_back( SfxChildWinFactory* p );
+void erase( iterator it );
+
+iterator begin();
+const_iterator begin() const;
+};
+
#endif
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 5d4fdbc..974276b 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -41,6 +41,7 @@
#define SfxModule
#include sfxslots.hxx
+#include childwinimpl.hxx
static SfxModuleArr_Impl* pModules=0;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 32c33e2..e1c0867 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -32,6 +32,7 @@
#include sfx2/dockwin.hxx
#include sfx2/viewsh.hxx
#include splitwin.hxx
+#include childwinimpl.hxx
#include sfx2/msgpool.hxx
#include sfx2/sfxresid.hxx
#include sfx2/request.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 15 commits - sw/source
sw/source/core/crsr/callnk.cxx |3 -
sw/source/core/doc/DocumentContentOperationsManager.cxx |3 -
sw/source/core/doc/doclay.cxx |3 -
sw/source/core/doc/doctxm.cxx |2
sw/source/core/doc/htmltbl.cxx |3 -
sw/source/core/doc/tblcpy.cxx |3 -
sw/source/core/layout/ftnfrm.cxx|2
sw/source/core/text/itradj.cxx |6 --
sw/source/core/txtnode/txtedt.cxx |2
sw/source/filter/ww8/wrtww8gr.cxx |4 -
sw/source/filter/ww8/ww8toolbar.cxx |3 -
sw/source/ui/misc/outline.cxx |2
sw/source/ui/vba/vbatablehelper.cxx | 14 --
sw/source/uibase/table/tablemgr.cxx | 33 ++--
sw/source/uibase/wrtsh/move.cxx |3 -
15 files changed, 42 insertions(+), 44 deletions(-)
New commits:
commit 949f3099f05d642ca4ee4b6ad676152bbea04824
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 21 12:56:13 2014 +0100
dead init (clang)
Change-Id: I7ad48c2a7bd1a63ebb9bda41fb5c28b19e7e6eab
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 64a390e..7916c27 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -520,10 +520,9 @@ bool SwWrtShell::PopCrsr(bool bUpdate, bool bSelect)
void SwWrtShell::_ResetCursorStack()
{
-CrsrStack *pTmp = pCrsrStack;
while(pCrsrStack)
{
-pTmp = pCrsrStack-pNext;
+CrsrStack* const pTmp = pCrsrStack-pNext;
delete pCrsrStack;
pCrsrStack = pTmp;
}
commit b5248ce4c5b5b8ec87dd604f616dc889bdb3a79b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 21 12:53:51 2014 +0100
dead init (clang)
Change-Id: Idc482b3b801bc755042f2a25676fa90c3066f14c
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 2cab3c5..5b52fc1 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -1065,7 +1065,7 @@ void NumberingPreview::Paint( const Rectangle /*rRect*/ )
}
nXStart /= 2;
nXStart += 2;
-long nTextOffset = 2 * nXStep;
+long nTextOffset;
if( SVX_NUM_BITMAP == rFmt.GetNumberingType() )
{
lcl_DrawGraphic(pVDev.get(), rFmt, nXStart, nYStart,
nWidthRelation);
commit cda69956c9d0769c4cb254c0e08ac912fe136fdb
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 21 12:52:21 2014 +0100
dead init (clang)
Change-Id: I009bad46c35c1cc76c59441ed4f6a03a31967e68
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index e33a8c5..bb0a00c 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -122,8 +122,7 @@ bool SwCTBWrapper::Read( SvStream rS )
// but the size of a SwTBC element is dynamic ( and this relates to
TBDelta's
int nStart = rS.Tell();
-int bytesRead = 0;
-int bytesToRead = cbDTBC - bytesRead;
+int bytesToRead;
// cbDTBC specifies the size ( in bytes ) taken by an array ( of
unspecified size )
// of SwTBC records ( SwTBC records have dynamic length, so we need to
check our position
// after each read )
commit 185009b7993d64d4240a580383eb16ab2b652f11
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 21 12:50:59 2014 +0100
dead init (clang)
Change-Id: Ie219bde00f4f0ec73d4474e30d1ad8af30c5b54c
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 58164c6..2e0e573 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1482,7 +1482,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/,
sal_Int32 /*nActPos*/
rSmartTagMgr.RecognizeTextRange(xRange, xTextMarkup, xController);
sal_Int32 nLangBegin = nBegin;
-sal_Int32 nLangEnd = nEnd;
+sal_Int32 nLangEnd;
// smart tag recognition has to be done for each language portion:
SwLanguageIterator aIter( *pNode, nLangBegin );
commit c6262d54395939e3d9514cb51f338a033b290d42
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Nov 21 12:43:28 2014 +0100
dead init (clang)
Change-Id: I67688e22f4486020a19e90baa4c4211fc4ef2d4f
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index edad812..c85e7b9 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -1248,7 +1248,7 @@ void SwFtnBossFrm::InsertFtn( SwFtnFrm* pNew )
}
nCmpPos = ::lcl_FindFtnPos( pDoc,
Layer manager window for Draw
This one feature alone would make Draw awesome : === Draw: add Layer manager window Idea: To improve handling the layers it is necessary to add a new window similar to Navigator (F5) which will show all layers, their status, order, visibility etc... Similar functions as in Gimp (f.ex.) Not sure if there is a LibreOffice feature voting tool - but this single feature gets my vote! -- Ron -- View this message in context: http://nabble.documentfoundation.org/Layer-manager-window-for-Draw-tp4129829.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/optdlg/calcoptionsdlg.cxx | 241 -
1 file changed, 90 insertions(+), 151 deletions(-)
New commits:
commit c1a0e74d3ce81e3e84c782e1a2f13dc814bf6575
Author: Tor Lillqvist t...@collabora.com
Date: Fri Nov 21 17:36:10 2014 +0200
Add new-style test generation for SUM and PRODUCT
Intermediate commit, still a bit buggy.
Also, bin the old code that was ifdeffed out.
Change-Id: I747c1864e4858672f0fe0512215405885e52c3b5
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 92653ab..17b1ff8 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1092,7 +1092,7 @@ struct UnOp : Op
pDoc-SetString(ScAddress(1,1+nRow,nTab),
OUString(=) + msOp + ( +
ScAddress(0,1+nRow,nTab).Format(SCA_VALID_COL|SCA_VALID_ROW) + ));
-pDoc-SetValue(ScAddress(2,1+nRow,nTab), (mpFun)(nArg));
+pDoc-SetValue(ScAddress(2,1+nRow,nTab), mpFun(nArg));
if (mnEpsilon 0)
{
@@ -1169,7 +1169,7 @@ struct BinOp : Op
OUString(=) +
ScAddress(0,1+nRow,nTab).Format(SCA_VALID_COL|SCA_VALID_ROW) +
msOp +
ScAddress(1,1+nRow,nTab).Format(SCA_VALID_COL|SCA_VALID_ROW));
-pDoc-SetValue(ScAddress(3,1+nRow,nTab), (mpFun)(nLhs, nRhs));
+pDoc-SetValue(ScAddress(3,1+nRow,nTab), mpFun(nLhs, nRhs));
pDoc-SetString(ScAddress(4,1+nRow,nTab),
OUString(=IF(ABS() +
ScAddress(2,1+nRow,nTab).Format(SCA_VALID_COL|SCA_VALID_ROW) +
@@ -1187,6 +1187,81 @@ struct BinOp : Op
}
};
+struct Reduction : Op
+{
+int mnNum;
+double mnAccumInitial;
+double (*mpFun)(double nAccum, double nArg);
+bool (*mpFilterOut)(double nArg);
+
+Reduction(const OUString rTitle,
+ const OUString rOp,
+ int nNum,
+ double nAccumInitial,
+ double nRangeLo, double nRangeHi,
+ double nEpsilon,
+ double (*pFun)(double nAccum, double nArg),
+ bool (*pFilterOut)(double nArg) = nullptr) :
+Op(rTitle, rOp, nRangeLo, nRangeHi, nEpsilon),
+mnNum(nNum),
+mnAccumInitial(nAccumInitial),
+mpFun(pFun),
+mpFilterOut(pFilterOut)
+{
+}
+
+virtual ~Reduction()
+{
+}
+
+virtual void addHeader(ScDocument *pDoc, int nTab) const SAL_OVERRIDE
+{
+pDoc-SetString(ScAddress(0,0,nTab), x);
+pDoc-SetString(ScAddress(1,0,nTab), msOp + ( +
OUString::number(mnNum) + ));
+pDoc-SetString(ScAddress(2,0,nTab), expected);
+}
+
+virtual void addRow(ScDocument *pDoc, int nRow, int nTab) const
SAL_OVERRIDE
+{
+double nArg;
+
+do {
+nArg = comphelper::rng::uniform_real_distribution(mnRangeLo,
mnRangeHi);
+} while (mpFilterOut != nullptr mpFilterOut(nArg));
+
+pDoc-SetValue(ScAddress(0,1+nRow,nTab), nArg);
+
+if (nRow = mnNum)
+{
+pDoc-SetString(ScAddress(1,1+nRow,nTab),
+OUString(=) + msOp + ( +
+ScRange(ScAddress(0,1+nRow-mnNum,nTab),
+
ScAddress(0,1+nRow,nTab)).Format(SCA_VALID|SCA_TAB_3D|SCA_VALID_COL|SCA_VALID_ROW)
+
+));
+
+double nAccum(mnAccumInitial);
+for (int i = 0; i mnNum; i++)
+nAccum = mpFun(nAccum,
pDoc-GetValue(ScAddress(0,1+nRow-mnNum+i,nTab)));
+
+pDoc-SetValue(ScAddress(2,1+nRow,nTab), nAccum);
+
+pDoc-SetString(ScAddress(3,1+nRow,nTab),
+OUString(=IF(ABS() +
ScAddress(1,1+nRow,nTab).Format(SCA_VALID_COL|SCA_VALID_ROW) +
+- +
ScAddress(2,1+nRow,nTab).Format(SCA_VALID_COL|SCA_VALID_ROW) +
+)= + OUString::number(mnEpsilon) +
+,0,1));
+}
+}
+
+virtual OUString getSummaryFormula(ScDocument *pDoc, int nTab) const
SAL_OVERRIDE
+{
+return OUString(=SUM() +
+ScRange(ScAddress(3,1+mnNum,nTab),
+
ScAddress(3,1+mnRows-1,nTab)).Format(SCA_VALID|SCA_TAB_3D|SCA_VALID_COL|SCA_VALID_ROW|SCA_VALID_TAB,
pDoc) +
+);
+}
+};
+
}
IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, )
@@ -1201,6 +1276,7 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl,
PushButton*, )
{
return nLhs + nRhs;
}));
+
pTestDocument-addTest(BinOp(Minus, -, -1000, 1000, 3e-10,
[] (double nLhs, double nRhs)
{
@@ -1212,6 +1288,7 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl,
PushButton*, )
{
return nLhs *
Re: Layer manager window for Draw
Ron, Thank you for helping us to improve LibreOffice. The most direct way to record your suggestion is in our bug tracking system https://bugs.freedesktop.org/. After you create an account, you can create a bug report with priority Enhancement. HTH, Terry. On Fri, 2014-11-21 at 08:30 -0700, Ron W wrote: This one feature alone would make Draw awesome : === Draw: add Layer manager window Idea: To improve handling the layers it is necessary to add a new window similar to Navigator (F5) which will show all layers, their status, order, visibility etc... Similar functions as in Gimp (f.ex.) Not sure if there is a LibreOffice feature voting tool - but this single feature gets my vote! -- Ron -- View this message in context: http://nabble.documentfoundation.org/Layer-manager-window-for-Draw-tp4129829.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - bridges/source sw/source
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx | 10 ++-- bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 13 + bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx |6 +- bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx | 14 +++--- bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx|4 - bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx |8 +-- bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 16 ++- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx |8 +-- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx|6 +- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx | 12 ++--- bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx | 12 ++--- bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 14 ++ bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx |4 - bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx| 17 +++ bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 26 --- bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx|9 +-- bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 14 ++ bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx| 24 +++--- bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx |8 +-- bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx | 10 ++-- bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx| 13 + bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx |2 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 15 +++--- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 20 +++- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx |7 +-- bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 14 ++ bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx| 24 +++--- bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx |8 +-- bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 15 +++--- bridges/source/cpp_uno/gcc3_linux_mips/except.cxx| 24 +++--- bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx |6 +- bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx| 14 +++--- bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 14 ++ bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx|6 +- bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 10 ++-- bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 13 + bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |2 bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx | 12 ++--- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx| 14 ++ bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx |6 +- bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 10 ++-- bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 14 ++ bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx |4 - bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx | 17 +++ bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 24 +++--- bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 14 +++--- bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 15 ++ bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx |9 +-- bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 19 ++-- bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |7 +-- bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx| 15 ++ bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx|9 +-- bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 20 +++- bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx|7 +-- bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx| 14 +++--- bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 24 +++--- bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx| 12 ++--- bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx| 17 +++ bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 24 +++--- bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx| 14 +++--- bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx |7 +-- bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx | 14 +++--- bridges/source/cpp_uno/mingw_intel/except.cxx| 22 +++-- bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx |6 +- bridges/source/cpp_uno/mingw_x86-64/abi.cxx | 15 +++--- bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx |8 +-- bridges/source/cpp_uno/mingw_x86-64/except.cxx | 22 +++-- bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx |6 +- bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx | 11 ++-- bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 29 +---
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx |2 -- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx |2 -- bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx |2 -- 3 files changed, 6 deletions(-) New commits: commit 42ff131336b79ffb5d6a498227bc4dbcfb7bcbee Author: Michael Stahl mst...@redhat.com Date: Fri Nov 21 17:38:06 2014 +0100 bridges: forgot to remove some include diagnose.h Change-Id: Ia4fb18a36769a3eecc20f92a6f5719b841964765 diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx index 0a6390d..a5757ae 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx @@ -34,8 +34,6 @@ // file as close to ../gcc3_linux_arm/cpp2uno.cxx as possible, to make // future unification easier. -#include osl/diagnose.h - #include com/sun/star/uno/RuntimeException.hpp #include uno/data.h #include typelib/typedescription.hxx diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx index ea95642..9060584 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx @@ -28,8 +28,6 @@ // place to keep this file as close to ../gcc3_linux_arm/uno2cpp.cxx // as possible, to make future unification easier. -#include osl/diagnose.h - #include com/sun/star/uno/RuntimeException.hpp #include bridges/cpp_uno/shared/bridge.hxx diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx index 8473b61..fbe00fc 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx @@ -19,8 +19,6 @@ #ifdef __arm64 -#include osl/diagnose.h - #include com/sun/star/uno/RuntimeException.hpp #include bridges/cpp_uno/shared/bridge.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx|2 +-
bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx |4 ++--
bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx |2 +-
bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx |2 +-
bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx |2 +-
bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx |2 +-
bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx|2 +-
bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx |2 +-
bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx |2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit f085b0ab07edbf812a179a5679487386834fe38a
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 21 17:50:33 2014 +0100
bridges: oops, static_assert requires 2nd string parameter
Change-Id: I09b461473f514f2b7c4f256aedbe129372bae9e3
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index 343d155..4922278 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -543,7 +543,7 @@ unsigned char* codeSnippet( unsigned char * code, sal_Int16
nFunctionIndex, sal_
if (! simple_ret_type)
nOffsetAndIndex |= 0x8000;
-static_assert( sizeof (long) == 4 );
+static_assert(sizeof (long) == 4, boo);
/* generate this code */
// lr %r0,%r13
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
index 53d71f9..fb475cf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx
@@ -96,7 +96,7 @@ static typelib_TypeClass cpp2uno_call(
{
if ((reinterpret_cast long (pCppStack) 7) != 0)
{
- static_assert(sizeof (double) == sizeof (sal_Int64));
+ static_assert(sizeof (double) == sizeof (sal_Int64), boo);
void * pDest = alloca( sizeof (sal_Int64) );
*reinterpret_cast sal_Int32 * (pDest) =
*reinterpret_cast sal_Int32 const * (pCppStack);
@@ -442,7 +442,7 @@ unsigned char * codeSnippet(
index |= 0x8000;
}
unsigned int * p = reinterpret_cast unsigned int * (code);
-static_assert(sizeof (unsigned int) == 4);
+static_assert(sizeof (unsigned int) == 4, boo);
// st %o0, [%sp+68]:
*p++ = 0xD023A044;
// st %o1, [%sp+72]:
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
index 0ac80dc..f3e4796 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx
@@ -336,7 +336,7 @@ static void cpp_call(
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
case typelib_TypeClass_DOUBLE:
-static_assert(sizeof (double) == sizeof (sal_Int64));
+static_assert(sizeof (double) == sizeof (sal_Int64),
boo);
*reinterpret_cast sal_Int32 * (pCppStack) =
*reinterpret_cast sal_Int32 const * (pUnoArgs[
nPos ]);
pCppStack += sizeof (sal_Int32);
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index 4ad28d2..5ef0fdc 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -407,7 +407,7 @@ unsigned char * codeSnippet(
functionIndex |= 0x8000;
}
unsigned char * p = code;
-static_assert(sizeof (sal_Int32) == 4);
+static_assert(sizeof (sal_Int32) == 4, boo);
// mov function_index, %eax:
*p++ = 0xB8;
*reinterpret_cast sal_Int32 * (p) = functionIndex;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index ce76c24..f5fe6e7 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -97,7 +97,7 @@ static typelib_TypeClass cpp2uno_call(
{
if ((reinterpret_cast long (pCppStack) 7) != 0)
{
- static_assert(sizeof (double) == sizeof (sal_Int64));
+ static_assert(sizeof (double) == sizeof (sal_Int64), boo);
void * pDest = alloca( sizeof (sal_Int64) );
*reinterpret_cast sal_Int32 * (pDest) =
*reinterpret_cast sal_Int32 const * (pCppStack);
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source
sc/inc/document.hxx|1
sc/source/core/data/document.cxx | 39 -
sc/source/core/data/document10.cxx | 22
3 files changed, 45 insertions(+), 17 deletions(-)
New commits:
commit 15bf6a424836cc1acb927371047ec65807e59039
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 11:57:23 2014 -0500
Handle group area listeners correctly when deleting cells.
Change-Id: Ic37084ed670f53e0354056f7bef54229971dd7c2
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e746d1d..acf0f67 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1914,6 +1914,7 @@ public:
boolGetHardRecalcState() { return bHardRecalcState; }
voidSetHardRecalcState( bool bVal ) { bHardRecalcState =
bVal; }
voidStartAllListeners();
+void StartNeededListeners();
const ScFormulaCell*GetFormulaTree() const { return pFormulaTree; }
boolHasForcedFormulas() const { return bHasForcedFormulas;
}
voidSetForcedFormulas( bool bVal ) { bHasForcedFormulas =
bVal; }
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4fb535d..4e3fd9d 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1154,19 +1154,6 @@ bool ScDocument::CanInsertRow( const ScRange rRange )
const
namespace {
-class StartNeededListenersHandler : std::unary_functionScTable*, void
-{
-boost::shared_ptrsc::StartListeningContext mpCxt;
-public:
-StartNeededListenersHandler( ScDocument rDoc ) : mpCxt(new
sc::StartListeningContext(rDoc)) {}
-
-void operator() (ScTable* p)
-{
-if (p)
-p-StartListeners(*mpCxt, false);
-}
-};
-
struct SetDirtyIfPostponedHandler : std::unary_functionScTable*, void
{
void operator() (ScTable* p)
@@ -1276,7 +1263,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB
nStartTab,
}
else
{ // Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the
// moved range must be recalculated, and all cells marked postponed
@@ -1369,7 +1356,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB
nStartTab,
if ( ValidRow(nStartRow+nSize) )
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the moved
// range must be recalculated, and all cells marked postponed dirty.
@@ -1475,7 +1462,7 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB
nStartTab,
else
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the
// moved range must be recalculated, and all cells marked postponed
// dirty.
@@ -1564,7 +1551,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB
nStartTab, SCROW nEndRow, SCTA
if ( ValidCol(sal::static_int_castSCCOL(nStartCol+nSize)) )
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the moved
// range must be recalculated, and all cells marked postponed dirty.
@@ -1777,11 +1764,29 @@ void ScDocument::DeleteArea(
PutInOrder( nCol1, nCol2 );
PutInOrder( nRow1, nRow2 );
+
+// Record the positions of top and/or bottom formula groups that intersect
+// the area borders.
+std::vectorScAddress aGroupPos;
+sc::EndListeningContext aCxt(*this);
+ScRange aRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
+for (size_t i = 0; i maTabs.size(); ++i)
+{
+aRange.aStart.SetTab(i);
+aRange.aEnd.SetTab(i);
+
+EndListeningIntersectedGroups(aCxt, aRange, aGroupPos);
+}
+aCxt.purgeEmptyBroadcasters();
+
for (SCTAB i = 0; i static_castSCTAB(maTabs.size()); i++)
if (maTabs[i])
if ( rMark.GetTableSelect(i) || bIsUndo )
maTabs[i]-DeleteArea(nCol1, nRow1, nCol2, nRow2, nDelFlag,
bBroadcast, pBroadcastSpans);
+// Re-start listeners on those top bottom groups that have been split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
}
void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1,
diff --git a/sc/source/core/data/document10.cxx
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/document.hxx|1
sc/source/core/data/document.cxx | 39 -
sc/source/core/data/document10.cxx | 22
3 files changed, 45 insertions(+), 17 deletions(-)
New commits:
commit 880f94b86ad8559081839fc444bfa1a589fdec29
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 11:57:23 2014 -0500
Handle group area listeners correctly when deleting cells.
Change-Id: Ic37084ed670f53e0354056f7bef54229971dd7c2
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fcb92dc..3dcdf08 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1915,6 +1915,7 @@ public:
boolGetHardRecalcState() { return bHardRecalcState; }
voidSetHardRecalcState( bool bVal ) { bHardRecalcState =
bVal; }
voidStartAllListeners();
+void StartNeededListeners();
const ScFormulaCell*GetFormulaTree() const { return pFormulaTree; }
boolHasForcedFormulas() const { return bHasForcedFormulas;
}
voidSetForcedFormulas( bool bVal ) { bHasForcedFormulas =
bVal; }
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a413388..8984e28 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1154,19 +1154,6 @@ bool ScDocument::CanInsertRow( const ScRange rRange )
const
namespace {
-class StartNeededListenersHandler : std::unary_functionScTable*, void
-{
-boost::shared_ptrsc::StartListeningContext mpCxt;
-public:
-StartNeededListenersHandler( ScDocument rDoc ) : mpCxt(new
sc::StartListeningContext(rDoc)) {}
-
-void operator() (ScTable* p)
-{
-if (p)
-p-StartListeners(*mpCxt, false);
-}
-};
-
struct SetDirtyIfPostponedHandler : std::unary_functionScTable*, void
{
void operator() (ScTable* p)
@@ -1276,7 +1263,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB
nStartTab,
}
else
{ // Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the
// moved range must be recalculated, and all cells marked postponed
@@ -1369,7 +1356,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB
nStartTab,
if ( ValidRow(nStartRow+nSize) )
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the moved
// range must be recalculated, and all cells marked postponed dirty.
@@ -1475,7 +1462,7 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB
nStartTab,
else
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the
// moved range must be recalculated, and all cells marked postponed
// dirty.
@@ -1564,7 +1551,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB
nStartTab, SCROW nEndRow, SCTA
if ( ValidCol(sal::static_int_castSCCOL(nStartCol+nSize)) )
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the moved
// range must be recalculated, and all cells marked postponed dirty.
@@ -1777,11 +1764,29 @@ void ScDocument::DeleteArea(
PutInOrder( nCol1, nCol2 );
PutInOrder( nRow1, nRow2 );
+
+// Record the positions of top and/or bottom formula groups that intersect
+// the area borders.
+std::vectorScAddress aGroupPos;
+sc::EndListeningContext aCxt(*this);
+ScRange aRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
+for (size_t i = 0; i maTabs.size(); ++i)
+{
+aRange.aStart.SetTab(i);
+aRange.aEnd.SetTab(i);
+
+EndListeningIntersectedGroups(aCxt, aRange, aGroupPos);
+}
+aCxt.purgeEmptyBroadcasters();
+
for (SCTAB i = 0; i static_castSCTAB(maTabs.size()); i++)
if (maTabs[i])
if ( rMark.GetTableSelect(i) || bIsUndo )
maTabs[i]-DeleteArea(nCol1, nRow1, nCol2, nRow2, nDelFlag,
bBroadcast, pBroadcastSpans);
+// Re-start listeners on those top bottom groups that have been split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
}
void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1,
diff --git a/sc/source/core/data/document10.cxx
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/inc sc/source
sc/inc/document.hxx|1
sc/source/core/data/document.cxx | 39 -
sc/source/core/data/document10.cxx | 22
3 files changed, 45 insertions(+), 17 deletions(-)
New commits:
commit 61b95bf99b1230acfdeb1723c372d9fad32921b2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 11:57:23 2014 -0500
Handle group area listeners correctly when deleting cells.
Change-Id: Ic37084ed670f53e0354056f7bef54229971dd7c2
(cherry picked from commit 880f94b86ad8559081839fc444bfa1a589fdec29)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fcb92dc..3dcdf08 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1915,6 +1915,7 @@ public:
boolGetHardRecalcState() { return bHardRecalcState; }
voidSetHardRecalcState( bool bVal ) { bHardRecalcState =
bVal; }
voidStartAllListeners();
+void StartNeededListeners();
const ScFormulaCell*GetFormulaTree() const { return pFormulaTree; }
boolHasForcedFormulas() const { return bHasForcedFormulas;
}
voidSetForcedFormulas( bool bVal ) { bHasForcedFormulas =
bVal; }
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a413388..8984e28 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1154,19 +1154,6 @@ bool ScDocument::CanInsertRow( const ScRange rRange )
const
namespace {
-class StartNeededListenersHandler : std::unary_functionScTable*, void
-{
-boost::shared_ptrsc::StartListeningContext mpCxt;
-public:
-StartNeededListenersHandler( ScDocument rDoc ) : mpCxt(new
sc::StartListeningContext(rDoc)) {}
-
-void operator() (ScTable* p)
-{
-if (p)
-p-StartListeners(*mpCxt, false);
-}
-};
-
struct SetDirtyIfPostponedHandler : std::unary_functionScTable*, void
{
void operator() (ScTable* p)
@@ -1276,7 +1263,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB
nStartTab,
}
else
{ // Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the
// moved range must be recalculated, and all cells marked postponed
@@ -1369,7 +1356,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB
nStartTab,
if ( ValidRow(nStartRow+nSize) )
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the moved
// range must be recalculated, and all cells marked postponed dirty.
@@ -1475,7 +1462,7 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB
nStartTab,
else
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the
// moved range must be recalculated, and all cells marked postponed
// dirty.
@@ -1564,7 +1551,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB
nStartTab, SCROW nEndRow, SCTA
if ( ValidCol(sal::static_int_castSCCOL(nStartCol+nSize)) )
{
// Listeners have been removed in UpdateReference
-std::for_each(maTabs.begin(), maTabs.end(),
StartNeededListenersHandler(*this));
+StartNeededListeners();
// At least all cells using range names pointing relative to the moved
// range must be recalculated, and all cells marked postponed dirty.
@@ -1777,11 +1764,29 @@ void ScDocument::DeleteArea(
PutInOrder( nCol1, nCol2 );
PutInOrder( nRow1, nRow2 );
+
+// Record the positions of top and/or bottom formula groups that intersect
+// the area borders.
+std::vectorScAddress aGroupPos;
+sc::EndListeningContext aCxt(*this);
+ScRange aRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
+for (size_t i = 0; i maTabs.size(); ++i)
+{
+aRange.aStart.SetTab(i);
+aRange.aEnd.SetTab(i);
+
+EndListeningIntersectedGroups(aCxt, aRange, aGroupPos);
+}
+aCxt.purgeEmptyBroadcasters();
+
for (SCTAB i = 0; i static_castSCTAB(maTabs.size()); i++)
if (maTabs[i])
if ( rMark.GetTableSelect(i) || bIsUndo )
maTabs[i]-DeleteArea(nCol1, nRow1, nCol2, nRow2, nDelFlag,
bBroadcast, pBroadcastSpans);
+// Re-start listeners on those top bottom groups that have been split.
+SetNeedsListeningGroups(aGroupPos);
+StartNeededListeners();
}
void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdoc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e37e8f38d1f5c6bc427965dc535f1a64f0c8649c
Author: Caolán McNamara caol...@redhat.com
Date: Fri Nov 21 17:05:09 2014 +
Resolves: fdo#86392 the assert seems to just want the attrs to be sorted
i.e. two at the same position is ok
assert added in
commit 8220b70fe2dc270188751950ac6d872320db1aa2
Date: Sun Jul 27 00:21:50 2014 -0400
bnc#467459 - fix editeng text search with expanded fields.
Change-Id: Ifc65f3301a7d505a7d2d13e5914f53cbe263fc1f
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 8baa214..e293425 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1724,7 +1724,7 @@ void ContentNode::UnExpandPosition( sal_Int32 rPos, bool
bBiasStart )
{
const EditCharAttrib rAttr = rAttrs[nAttr];
assert (!(nAttr rAttrs.size() - 1) ||
-rAttrs[nAttr].GetStart() rAttrs[nAttr + 1].GetStart());
+rAttrs[nAttr].GetStart() = rAttrs[nAttr + 1].GetStart());
nOffset = rAttr.GetStart();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/header-border.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |7 +++
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx |4 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 +++
4 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 17e51f427b3f0cec74ac8e0a1b3f51189006ae6f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Nov 21 17:41:24 2014 +0100
DOCX import: first page header should always set default headers as well
writerfilter imports a section with first and default headers / footers
as two page styles: a first page one and a follow one. In case we
nominally have a header on the first page only, we still need to enable
it in the follow page style as well, otherwise on export when we
recognize the first + follow chain as a single section, we'll end up
with a header that looses its header margin.
Change-Id: I4923daffefb243d2de4805a9931150ce4d9a6c81
diff --git a/sw/qa/extras/ooxmlexport/data/header-border.docx
b/sw/qa/extras/ooxmlexport/data/header-border.docx
new file mode 100644
index 000..18ee9f5
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/header-border.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 6d9bfc7..fd9341c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -700,6 +700,13 @@ DECLARE_OOXMLEXPORT_TEST(testFD083057, fdo83057.docx)
assertXPath(pXmlDoc, //mc:AlternateContent//w:sdt, 0);
}
+DECLARE_OOXMLEXPORT_TEST(testHeaderBorder, header-border.docx)
+{
+// This was 0, as header margin was lost during import.
+if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+assertXPath(pXmlDoc, //w:pgMar, header, 720);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index 1432888..3d71241 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -453,7 +453,7 @@ DECLARE_OOXMLEXPORT_TEST(testVMLData, TestVMLData.docx)
{
// The problem was exporter was exporting vml data for shape in w:rPr
element.
// vml data should not come under w:rPr element.
-xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+xmlDocPtr pXmlDoc = parseExport(word/header2.xml);
if (!pXmlDoc)
return;
CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:hdr/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect,
stroked).match(f));
@@ -463,7 +463,7 @@ DECLARE_OOXMLEXPORT_TEST(testImageData, image_data.docx)
{
// The problem was exporter was exporting v:imagedata data for shape in
w:pict as v:fill w element.
-xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+xmlDocPtr pXmlDoc = parseExport(word/header2.xml);
if (!pXmlDoc)
return;
CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:hdr/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:imagedata,
detectmouseclick).match(t));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b4fa15b..5c3aaeb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1478,6 +1478,17 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool
bHeader, SectionPropertyMap::P
rPropNameSupplier.GetName(ePropIsOn),
uno::makeAny(sal_True));
+if (bFirst)
+{
+OUString aFollowStyle =
xPageStyle-getPropertyValue(FollowStyle).getOUString();
+if (GetPageStyles()-hasByName(aFollowStyle))
+{
+// This is a first page and has a follow style, then
enable the header/footer there as well to be consistent.
+uno::Referencebeans::XPropertySet
xFollowStyle(GetPageStyles()-getByName(aFollowStyle), uno::UNO_QUERY);
+
xFollowStyle-setPropertyValue(rPropNameSupplier.GetName(ePropIsOn),
uno::makeAny(sal_True));
+}
+}
+
// If the 'Different Even Odd Pages' flag is turned on - do
not ignore it
// Even if the 'Even' header/footer is blank - the flag should
be imported (so it would look in LO like in Word)
if (!bFirst GetSettingsTable()-GetEvenAndOddHeaders())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: io/source
io/source/TextInputStream/TextInputStream.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a0bfcbce147eff61dc9b7d243b571dd34110df8 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 21 18:31:31 2014 +0100 fdo#79941: Properly handle short reads Change-Id: Ie762ff272410d809382f98a1d446946b566df747 diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx index 1f2db18..ceee33a 100644 --- a/io/source/TextInputStream/TextInputStream.cxx +++ b/io/source/TextInputStream/TextInputStream.cxx @@ -294,7 +294,7 @@ sal_Int32 OTextInputStream::implReadNext() sal_Int32 nBytesToRead = READ_BYTE_COUNT; sal_Int32 nRead = mxStream-readSomeBytes( mSeqSource, nBytesToRead ); sal_Int32 nTotalRead = nRead; -if( nRead nBytesToRead ) +if( nRead == 0 ) mbReachedEOF = true; // Try to convert ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx |1
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 157 +++
2 files changed, 101 insertions(+), 57 deletions(-)
New commits:
commit c90741573814173e9df5bf945d8cbe9d7d77ec39
Author: Louis-Francis Ratté-Boulianne l...@collabora.com
Date: Fri Nov 21 12:17:02 2014 -0500
vcl: Use old method for pixmap painting for GTK widgets without OpenGL
Change-Id: Ie6078308f7a7f70683a7f963b15857b5dac753b0
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 9ce374d..568ef5c 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -133,6 +133,7 @@ public:
// will be set when UI theme was changed
static boolbThemeChanged;
static boolbNeedPixmapPaint;
+static boolbNeedTwoPasses;
// native widget methods
virtual boolIsNativeControlSupported( ControlType nType,
ControlPart nPart ) SAL_OVERRIDE;
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 46ec7b4..f3b1ecf6 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -49,10 +49,12 @@ const char* const
tabPrelitDataName=libreoffice-tab-is-prelit;
// initialize statics
bool GtkSalGraphics::bThemeChanged = true;
bool GtkSalGraphics::bNeedPixmapPaint = false;
+bool GtkSalGraphics::bNeedTwoPasses = false;
enum
{
BG_NONE = 0,
+BG_FILL,
BG_WHITE,
BG_BLACK
};
@@ -511,7 +513,10 @@ void GtkData::initNWF( void )
// use offscreen rendering when using OpenGL backend
if( OpenGLHelper::isVCLOpenGLEnabled() )
+{
GtkSalGraphics::bNeedPixmapPaint = true;
+GtkSalGraphics::bNeedTwoPasses = true;
+}
int nScreens = GetGtkSalData()-GetGtkDisplay()-GetXScreenCount();
gWidgetData = WidgetDataVector( nScreens );
@@ -898,13 +903,24 @@ bool GtkSalGraphics::drawNativeControl(ControlType
nType,
aPixmapRect = Rectangle( Point( aCtrlRect.Left()-1, aCtrlRect.Top()-1
),
Size( aCtrlRect.GetWidth()+2,
aCtrlRect.GetHeight()+2) );
-xPixmap.reset( NWGetPixmapFromScreen( aPixmapRect, BG_WHITE ) );
-xMask.reset( NWGetPixmapFromScreen( aPixmapRect, BG_BLACK ) );
-if( !xPixmap || !xMask )
-return false;
-nPasses = 2;
-gdkDrawable[0] = xPixmap-GetGdkDrawable();
-gdkDrawable[1] = xMask-GetGdkDrawable();
+if( bNeedTwoPasses )
+{
+xPixmap.reset( NWGetPixmapFromScreen( aPixmapRect, BG_WHITE ) );
+xMask.reset( NWGetPixmapFromScreen( aPixmapRect, BG_BLACK ) );
+if( !xPixmap || !xMask )
+return false;
+nPasses = 2;
+gdkDrawable[0] = xPixmap-GetGdkDrawable();
+gdkDrawable[1] = xMask-GetGdkDrawable();
+}
+else
+{
+xPixmap.reset( NWGetPixmapFromScreen( aPixmapRect, BG_FILL ) );
+if( !xPixmap )
+return false;
+nPasses = 1;
+gdkDrawable[0] = xPixmap-GetGdkDrawable();
+}
aCtrlRect = Rectangle( Point(1,1), aCtrlRect.GetSize() );
aClip.push_back( aCtrlRect );
@@ -926,7 +942,6 @@ bool GtkSalGraphics::drawNativeControl(ControlType
nType,
}
bool returnVal = false;
-SAL_INFO( vcl.opengl, Rendering with nPasses passe(s) );
for( int i = 0; i nPasses; ++i )
{
@@ -1324,6 +1339,62 @@ bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
/
* Individual control drawing functions
/
+
+// macros to call before and after the rendering code for a widget
+// it takes care of creating the needed pixmaps
+#define BEGIN_PIXMAP_RENDER(aRect, gdkPixmap) \
+std::unique_ptrGdkX11Pixmap _pixmap, _mask; \
+int _nPasses = 0; \
+if( bNeedTwoPasses ) \
+{ \
+_nPasses = 2; \
+_pixmap.reset( NWGetPixmapFromScreen( aRect, BG_WHITE ) ); \
+_mask.reset( NWGetPixmapFromScreen( aRect, BG_BLACK ) ); \
+} \
+else \
+{ \
+_nPasses = 1; \
+_pixmap.reset( NWGetPixmapFromScreen( aRect, BG_FILL ) ); \
+} \
+if( !_pixmap || ( bNeedTwoPasses !_mask ) ) \
+return false; \
+for( int i = 0; i _nPasses; ++i ) \
+{ \
+GdkPixmap* gdkPixmap = (i == 0) ? _pixmap-GetGdkPixmap() \
+: _mask-GetGdkPixmap();
+
+#define END_PIXMAP_RENDER(aRect) \
+} \
+if( !NWRenderPixmapToScreen( _pixmap.get(), _mask.get(), aRect ) ) \
+return false;
+
+// same as above but with pixmaps that should be kept for caching
+#define BEGIN_CACHE_PIXMAP_RENDER(aRect, pixmap, mask, gdkPixmap) \
+int _nPasses = 0; \
+if( bNeedTwoPasses ) \
+{ \
+
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|8 +++-
sw/source/filter/ww8/docxattributeoutput.cxx | 11 ++-
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 5009ed5eaff6769375d8d0423a98fe8d1a31e0d1
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Nov 21 18:22:53 2014 +0100
DOCX export: fix page border spacing in case of headers/footers
It is clear that Word/Writer has different page margin / border spacing
models: in Word, the page margin includes everything and border spacing
is a subset of that, in Writer the real distance between the body frame
and the page frame is the sum of the two.
What was less clear is what headers / footers add to this mix. It turns
out that in case we have a header as well, then for large borders, we
need to count the difference of the page frame and the header frame, not
the difference of the page frame and the body frame.
Change-Id: I3c828eeec2df461985110064ab0bf21b36594095
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index fd9341c..26f521b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -702,9 +702,15 @@ DECLARE_OOXMLEXPORT_TEST(testFD083057, fdo83057.docx)
DECLARE_OOXMLEXPORT_TEST(testHeaderBorder, header-border.docx)
{
-// This was 0, as header margin was lost during import.
if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+{
+// This was 0, as header margin was lost during import.
assertXPath(pXmlDoc, //w:pgMar, header, 720);
+// This was 33: 33 points - 660 twips. We counted 900 - 240 (distance
+// of page and body frame) instead of 720 - 240 (distance of page and
+// header frame).
+assertXPath(pXmlDoc, //w:pgBorders/w:top, space, 24);
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index cacbe97..4e4dccd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -5499,8 +5499,17 @@ void DocxAttributeOutput::SectionPageBorders( const
SwFrmFmt* pFmt, const SwFrmF
aOutputBorderOptions.aShadowLocation = pShadowItem-GetLocation();
}
+// By top margin, impl_borders() means the distance between the top of
the page and the header frame.
+PageMargins aMargins = m_pageMargins;
+HdFtDistanceGlue aGlue(pFmt-GetAttrSet());
+if (aGlue.HasHeader())
+aMargins.nPageMarginTop = aGlue.dyaHdrTop;
+// Ditto for bottom margin.
+if (aGlue.HasFooter())
+aMargins.nPageMarginBottom = aGlue.dyaHdrBottom;
+
std::mapsal_uInt16, css::table::BorderLine2 aEmptyMap; // empty
styles map
-impl_borders( m_pSerializer, rBox, aOutputBorderOptions,
m_pageMargins,
+impl_borders( m_pSerializer, rBox, aOutputBorderOptions, aMargins,
aEmptyMap );
m_pSerializer-endElementNS( XML_w, XML_pgBorders );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/except.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 04a7e55b486d4da83434ce6c81036b3fcf7be469
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 21 18:38:38 2014 +0100
bridges: oops some semicolons got lost
Change-Id: I5c2f9286067237ec1a9df6a47009e25e82ea7f63
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 675187c..23ebca5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -309,7 +309,7 @@ namespace CPPU_CURRENT_NAMESPACE
RuntimeException aRE( no exception header! );
Type const rType = ::getCppuType( aRE );
uno_type_any_constructAndConvert( pUnoExc, aRE,
rType.getTypeLibType(), pCpp2Uno );
-SAL_WARN(bridges, aRE.Message)
+SAL_WARN(bridges, aRE.Message);
return;
}
@@ -325,7 +325,7 @@ namespace CPPU_CURRENT_NAMESPACE
RuntimeException aRE( OUString(exception type not found: ) +
unoName );
Type const rType = ::getCppuType( aRE );
uno_type_any_constructAndConvert( pUnoExc, aRE,
rType.getTypeLibType(), pCpp2Uno );
-SAL_WARN(bridges, aRE.Message)
+SAL_WARN(bridges, aRE.Message);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py
ciabot/libreoffice-bugzilla2.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b98a721a46192647d2161491ad204144c07c5b69 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Nov 21 18:44:02 2014 +0100 libreoffice-bugzilla2: 4.4 - 4.5 Change-Id: I149adf0420901a58f2f7d56c49cddaaa3416b30b diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py index a4f862a..5e67ebe 100644 --- a/ciabot/libreoffice-bugzilla2.py +++ b/ciabot/libreoffice-bugzilla2.py @@ -33,7 +33,7 @@ import bugzilla from bugzilla import Bugzilla from bugzilla.base import _BugzillaToken -master_target = 4.4.0 +master_target = 4.5.0 bug_regex = fdo#(\d+) class FreedesktopBZ: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeOpenBSD.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - 3 files changed, 3 deletions(-) New commits: commit 384595f07528aa4323769c8825ea6efa94ea3c4c Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Nov 21 19:20:10 2014 +0100 Drop more --enable/disable-opengl Change-Id: Ibf77827455faba2f5d94b9fec26bff512713f73d diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 6974db7..2ab94d4 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -19,7 +19,6 @@ --with-external-dict-dir=/usr/share/hunspell --enable-dbus --enable-extension-integration ---enable-opengl --enable-odk --enable-lockdown --enable-kde diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 64e69c7..05a7394 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -5,7 +5,6 @@ --disable-kde4 --disable-nss-module --disable-odk ---disable-opengl --disable-randr-link --enable-gstreamer-0-10 --enable-lockdown diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 44241cc..8eb365f 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -25,7 +25,6 @@ --enable-extra-sample --enable-extra-font --with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl ---enable-opengl --enable-dbus --enable-gnome-vfs --enable-extensions ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeOpenBSD.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - 3 files changed, 3 deletions(-) New commits: commit 008bf8c595e37b7267ec37e4423cd60304160475 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Nov 21 19:20:10 2014 +0100 Drop more --enable/disable-opengl Change-Id: Ibf77827455faba2f5d94b9fec26bff512713f73d (cherry picked from commit 384595f07528aa4323769c8825ea6efa94ea3c4c) diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 6974db7..2ab94d4 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -19,7 +19,6 @@ --with-external-dict-dir=/usr/share/hunspell --enable-dbus --enable-extension-integration ---enable-opengl --enable-odk --enable-lockdown --enable-kde diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 64e69c7..05a7394 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -5,7 +5,6 @@ --disable-kde4 --disable-nss-module --disable-odk ---disable-opengl --disable-randr-link --enable-gstreamer-0-10 --enable-lockdown diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 44241cc..8eb365f 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -25,7 +25,6 @@ --enable-extra-sample --enable-extra-font --with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl ---enable-opengl --enable-dbus --enable-gnome-vfs --enable-extensions ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/filters-test.cxx | 27 ---
1 file changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 674c7abbd6b5e9014812d4f8839f62639fe9a7f4
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 19:26:06 2014 +0100
check that sort with absolute references works in both modes
Change-Id: I7de490377fbceb17e7d678590c46d24674bd8024
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 618fd94..1592241 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -613,22 +613,35 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
// Document contains cached external references.
void ScFiltersTest::testSortWithSheetExternalReferencesODS()
{
-// this test only works with UpdateReferenceOnSort == true, set it now.
-// we reset the value back to the original in tearDown()
-ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
-aInputOption.SetSortRefUpdate(true);
-SC_MOD()-SetInputOptions(aInputOption);
-
ScDocShellRef xDocSh = loadDoc(sort-with-sheet-external-references.,
ODS, true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument rDoc = xDocSh-GetDocument();
sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on.
rDoc.CalcAll();
+// The relative test only works with UpdateReferenceOnSort == true, set it
+// now. We reset the value back to the original in tearDown()
+ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
+aInputOption.SetSortRefUpdate(true);
+SC_MOD()-SetInputOptions(aInputOption);
+
// Sort A15:D20 with relative row references.
testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19);
-// Sort A23:D28 with absolute row references.
+// Sort with absolute references has to work in both UpdateReferenceOnSort
+// modes.
+
+// Sort A23:D28 with absolute row references. UpdateReferenceOnSort==true
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
+
+// Undo sort with absolute references to perform same sort.
+rDoc.GetUndoManager()-Undo();
+rDoc.CalcAll();
+
+aInputOption.SetSortRefUpdate(false);
+SC_MOD()-SetInputOptions(aInputOption);
+
+// Sort A23:D28 with absolute row references. UpdateReferenceOnSort==false
testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
xDocSh-DoClose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/qa
sc/qa/unit/filters-test.cxx | 27 ---
1 file changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 7feda69016fc42b889dfc5b8de088bbca36ba931
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 21 19:26:06 2014 +0100
check that sort with absolute references works in both modes
Change-Id: I7de490377fbceb17e7d678590c46d24674bd8024
(cherry picked from commit 674c7abbd6b5e9014812d4f8839f62639fe9a7f4)
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 618fd94..1592241 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -613,22 +613,35 @@ void ScFiltersTest::testSortWithSharedFormulasODS()
// Document contains cached external references.
void ScFiltersTest::testSortWithSheetExternalReferencesODS()
{
-// this test only works with UpdateReferenceOnSort == true, set it now.
-// we reset the value back to the original in tearDown()
-ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
-aInputOption.SetSortRefUpdate(true);
-SC_MOD()-SetInputOptions(aInputOption);
-
ScDocShellRef xDocSh = loadDoc(sort-with-sheet-external-references.,
ODS, true);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument rDoc = xDocSh-GetDocument();
sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on.
rDoc.CalcAll();
+// The relative test only works with UpdateReferenceOnSort == true, set it
+// now. We reset the value back to the original in tearDown()
+ScInputOptions aInputOption = SC_MOD()-GetInputOptions();
+aInputOption.SetSortRefUpdate(true);
+SC_MOD()-SetInputOptions(aInputOption);
+
// Sort A15:D20 with relative row references.
testSortWithSheetExternalReferencesODS_Impl( xDocSh, 14, 19);
-// Sort A23:D28 with absolute row references.
+// Sort with absolute references has to work in both UpdateReferenceOnSort
+// modes.
+
+// Sort A23:D28 with absolute row references. UpdateReferenceOnSort==true
+testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
+
+// Undo sort with absolute references to perform same sort.
+rDoc.GetUndoManager()-Undo();
+rDoc.CalcAll();
+
+aInputOption.SetSortRefUpdate(false);
+SC_MOD()-SetInputOptions(aInputOption);
+
+// Sort A23:D28 with absolute row references. UpdateReferenceOnSort==false
testSortWithSheetExternalReferencesODS_Impl( xDocSh, 22, 27);
xDocSh-DoClose();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/Library_sofficeapp.mk desktop/unx include/vcl svx/Executable_gengal.mk sw/Executable_tiledrendering.mk vcl/Executable_icontest.mk vcl/Executable_ui-previewer.mk
desktop/Library_sofficeapp.mk |4 desktop/unx/source/glxtest.cxx | 282 include/vcl/opengl/glxtest.hxx |2 svx/Executable_gengal.mk|7 sw/Executable_tiledrendering.mk | 16 ++ vcl/Executable_icontest.mk |9 + vcl/Executable_ui-previewer.mk | 15 ++ vcl/Executable_vcldemo.mk | 15 ++ vcl/Module_vcl.mk |1 vcl/StaticLibrary_glxtest.mk| 45 ++ vcl/source/salmain/salmain.cxx |7 vcl/unx/glxtest.cxx | 280 +++ 12 files changed, 399 insertions(+), 284 deletions(-) New commits: commit bcd8f9e265faaca5905feb6bdd79e63161909368 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Nov 21 12:45:51 2014 +0100 make glxtest available in salmain Change-Id: Ic8bc3f2d5d96506590d35138089ead2eac984314 diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index f322a6c..da37f9a 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -95,8 +95,8 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_exception_objects,sofficeapp,\ -desktop/unx/source/glxtest \ +$(eval $(call gb_Library_use_static_libraries,sofficeapp,\ +glxtest \ )) $(eval $(call gb_Library_add_libs,sofficeapp,\ diff --git a/include/vcl/opengl/glxtest.hxx b/include/vcl/opengl/glxtest.hxx index 0889cdd..687038f 100644 --- a/include/vcl/opengl/glxtest.hxx +++ b/include/vcl/opengl/glxtest.hxx @@ -16,6 +16,8 @@ VCL_DLLPUBLIC int* getGlxPipe(); VCL_DLLPUBLIC pid_t* getGlxPid(); +bool fire_glxtest_process(); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 55cc2f1..17a57dc 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -65,6 +65,13 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_libs,gengal,\ -ldl \ -lpthread \ +-lGL \ +-lGLU \ +-lX11 \ +)) + +$(eval $(call gb_Executable_use_static_libraries,gengal,\ + glxtest \ )) endif diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk index 089b0f5..f5664da 100644 --- a/sw/Executable_tiledrendering.mk +++ b/sw/Executable_tiledrendering.mk @@ -42,4 +42,20 @@ $(eval $(call gb_Executable_add_exception_objects,tiledrendering,\ sw/qa/tiledrendering/tiledrendering \ )) +ifeq ($(OS),LINUX) + +$(eval $(call gb_Executable_add_libs,tiledrendering,\ + -lm \ + -ldl \ + -lpthread \ +-lGL \ +-lGLU \ +-lX11 \ +)) + +$(eval $(call gb_Executable_use_static_libraries,tiledrendering,\ + glxtest \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index d7962d8..00dc906 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -24,7 +24,16 @@ $(eval $(call gb_Executable_use_api,icontest,\ ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_libs,icontest,\ + -lm \ + -ldl \ + -lpthread \ -lGL \ +-lGLU \ +-lX11 \ +)) + +$(eval $(call gb_Executable_use_static_libraries,icontest,\ + glxtest \ )) else ifeq ($(OS),WNT) diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 444ded1..665f683 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -34,4 +34,19 @@ $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ vcl/source/uipreviewer/previewer \ )) +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_libs,ui-previewer,\ + -lm \ + -ldl \ + -lpthread \ +-lGL \ +-lGLU \ +-lX11 \ +)) + +$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\ + glxtest \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk index 721605f..44f13b2 100644 --- a/vcl/Executable_vcldemo.mk +++ b/vcl/Executable_vcldemo.mk @@ -41,4 +41,19 @@ $(eval $(call gb_Executable_use_static_libraries,vcldemo,\ vclmain \ )) +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_libs,vcldemo,\ + -lm \ + -ldl \ + -lpthread \ +-lGL \ +-lGLU \ +-lX11 \ +)) + +$(eval $(call gb_Executable_use_static_libraries,vcldemo,\ + glxtest \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 5d1d2d2..01db2e7 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gen \ Library_desktop_detector \ StaticLibrary_headless \ + StaticLibrary_glxtest \ Package_fontunxppds \ Package_fontunxpsprint \ )) diff --git a/vcl/StaticLibrary_glxtest.mk b/vcl/StaticLibrary_glxtest.mk new file mode 100644 index 000..1e28775 --- /dev/null +++ b/vcl/StaticLibrary_glxtest.mk @@ -0,0 +1,45 @@ +#
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/new-control.py
test-bugzilla-files/new-control.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3228b8cbd5710083c13eaae354daa88a0541d5f6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Nov 21 21:55:32 2014 +0100
use new limit for better server
diff --git a/test-bugzilla-files/new-control.py
b/test-bugzilla-files/new-control.py
index c278a2a..a195d39 100644
--- a/test-bugzilla-files/new-control.py
+++ b/test-bugzilla-files/new-control.py
@@ -75,7 +75,7 @@ if __name__ == __main__:
sys.exit(1)
task_size = 100
-with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+with concurrent.futures.ThreadPoolExecutor(max_workers=20) as executor:
future_to_task = {executor.submit(execute_task, task_file): task_file
for task_file in get_tasks(directory, task_size)}
for future in concurrent.futures.as_completed(future_to_task):
task = future_to_task[future]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py
ciabot/libreoffice-bugzilla2.py |3 +++ 1 file changed, 3 insertions(+) New commits: commit b16c74e070044ca85af06ed620b9a9a3369876a9 Author: Michael Stahl mst...@redhat.com Date: Thu Nov 6 15:48:53 2014 +0100 libreoffice-bugzilla2.py: try to avoid modifying non-LO bugs ... which can happen when mis-typing bug ids. Change-Id: I20d88a0aec83c7328d5ff6294adaa1e1f8d69a74 diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py index 5e67ebe..e072f69 100644 --- a/ciabot/libreoffice-bugzilla2.py +++ b/ciabot/libreoffice-bugzilla2.py @@ -53,6 +53,9 @@ class FreedesktopBZ: def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name): bug = self.bz.getbug(bugnr) print(bug) +if bug.product != LibreOffice: +print(refusing to update bug with non-LO component) +return; old_whiteboard = bug.getwhiteboard() m = re.findall(new_version, old_whiteboard) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/app/swdll.cxx| 11 +++
sw/source/uibase/app/swmodule.cxx | 10 --
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit d47b674951aedd03815a3f27591b1791f7dfb52d
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 21 22:38:02 2014 +0100
fdo#86494: sw: fix crash on exit from SwAutoCorrect
5bff4b016c4b44f4123e0e6a4fd4c0c4dc0cfa2d was not enough to fix it,
so move it to SwDLL so it gets deleted earlier, before the global
pool items.
(regression from 4404b718bdb547cb9b7b17c73a53574724cdeeb7)
Change-Id: I4f88047852ea71f07ffa1f272ea66743f9797327
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index cb6d19e..1e598ef 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -41,7 +41,9 @@
#include svx/fmobjfac.hxx
#include svx/svdfield.hxx
#include svx/objfac3d.hxx
+#include editeng/acorrcfg.hxx
+#include swacorr.hxx
#include unomid.h
#include swdllimpl.hxx
@@ -135,10 +137,19 @@ SwDLL::SwDLL()
// register your controllers here
RegisterControls();
#endif
+
+// replace SvxAutocorrect with SwAutocorrect
+SvxAutoCorrCfg rACfg = SvxAutoCorrCfg::Get();
+const SvxAutoCorrect* pOld = rACfg.GetAutoCorrect();
+rACfg.SetAutoCorrect(new SwAutoCorrect( *pOld ));
}
SwDLL::~SwDLL()
{
+// fdo#86494 SwAutoCorrect must be deleted before _FinitCore
+SvxAutoCorrCfg rACfg = SvxAutoCorrCfg::Get();
+rACfg.SetAutoCorrect(0); // delete SwAutoCorrect before exit handlers
+
// Pool has to be deleted before statics are
SW_MOD()-RemoveAttrPool();
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index e3817b1..ce4339a 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -60,7 +60,6 @@
#include docsh.hxx
#include swmodule.hxx
#include swevent.hxx
-#include swacorr.hxx
#include cmdid.h
#include dobjfac.hxx
#include init.hxx
@@ -118,7 +117,6 @@
#include svx/rubydialog.hxx
#include svtools/colorcfg.hxx
-#include editeng/acorrcfg.hxx
#include unotools/moduleoptions.hxx
#include avmedia/mediaplayer.hxx
@@ -192,11 +190,6 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
pAuthorNames = new std::vectorOUString; // All Redlining-Authors
-// replace SvxAutocorrect with SwAutocorrect
-SvxAutoCorrCfg rACfg = SvxAutoCorrCfg::Get();
-const SvxAutoCorrect* pOld = rACfg.GetAutoCorrect();
-rACfg.SetAutoCorrect(new SwAutoCorrect( *pOld ));
-
StartListening( *SfxGetpApp() );
// OD 14.02.2003 #107424# - init color configuration
@@ -227,9 +220,6 @@ SwModule::~SwModule()
{
delete pErrorHdl;
EndListening( *SfxGetpApp() );
-
-SvxAutoCorrCfg rACfg = SvxAutoCorrCfg::Get();
-rACfg.SetAutoCorrect(0); // delete SwAutCorrect before exit handlers
}
void SwModule::CreateLngSvcEvtListener()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/priorities' - basctl/source
basctl/source/dlged/dlged.cxx | 12
basctl/source/inc/dlged.hxx |2 --
2 files changed, 14 deletions(-)
New commits:
commit dbe53133817ee00743216e9f0532f8d63e6f16eb
Author: Tobias Madl tobias.madl@gmail.com
Date: Fri Nov 21 21:16:47 2014 +
timers: Timer never started, remove it completely.
Change-Id: I119529498f4bea014e5e0d3d81c39203080ff1c4
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index e1b40a1..d8c4be4 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -219,9 +219,6 @@ DlgEditor::DlgEditor (
m_ClipboardDataFlavorsResource[1].HumanPresentableName = Dialog 8.0 ;
m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType(
(const Sequence sal_Int8 *) 0 );
-aPaintIdle.SetPriority( VCL_IDLE_PRIORITY_HIGH );
-aPaintIdle.SetIdleHdl( LINK( this, DlgEditor, PaintTimeout ) );
-
aMarkIdle.SetPriority(VCL_IDLE_PRIORITY_LOW);
aMarkIdle.SetIdleHdl( LINK( this, DlgEditor, MarkTimeout ) );
@@ -249,7 +246,6 @@ DlgEditor::DlgEditor (
DlgEditor::~DlgEditor()
{
-aPaintIdle.Stop();
aMarkIdle.Stop();
::comphelper::disposeComponent( m_xControlContainer );
@@ -478,12 +474,6 @@ bool DlgEditor::KeyInput( const KeyEvent rKEvt )
void DlgEditor::Paint( const Rectangle rRect )
{
aPaintRect = rRect;
-PaintTimeout( aPaintIdle );
-}
-
-
-IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
-{
mnPaintGuard++;
Size aMacSize;
@@ -580,8 +570,6 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
}
mnPaintGuard--;
-
-return 0;
}
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 794f3f7..cd722fe 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -100,7 +100,6 @@ public:
};
private:
-DECL_LINK(PaintTimeout, void *);
DECL_LINK(MarkTimeout, void *);
void Print( Printer* pPrinter, const OUString rTitle );
@@ -128,7 +127,6 @@ private:
boolbGridVisible;
boolbGridSnap;
boolbCreateOK;
-IdleaPaintIdle;
Rectangle aPaintRect;
boolbDialogModelChanged;
IdleaMarkIdle;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|67347 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||67347 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||77592 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|77592 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/inc/swmodeltestbase.hxx | 54 -
sw/qa/extras/mailmerge/mailmerge.cxx | 69 --
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 12 +--
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 +--
sw/source/core/unocore/unofield.cxx |3
writerfilter/source/dmapper/DomainMapper.cxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2
writerfilter/source/rtftok/rtfdocumentimpl.cxx| 11 +--
8 files changed, 85 insertions(+), 79 deletions(-)
New commits:
commit 186d021c157ddcbe98474dd347c80e8dcc7ab471
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Nov 21 22:31:56 2014 +0100
Use oox::drawingml::convertEmuToHmm()
This makes the +1 hack unnecessary in CppunitTest_sw_ooxmlexport2.
Change-Id: Ibf0a32b0bf03e9b47850edb335947e4ec383327b
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index e5966e3..4f71ff6 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -51,7 +51,6 @@
using namespace css;
#define DEFAULT_STYLE Default Style
-#define EMU_TO_MM100(EMU) (EMU / 360)
/**
* Macro to declare a new test (with full round-trip. To test
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 8dc4e94..6d7a87a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -49,6 +49,7 @@
#include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp
#include com/sun/star/drawing/TextVerticalAdjust.hpp
#include com/sun/star/drawing/Hatch.hpp
+#include oox/drawingml/drawingmltypes.hxx
#include string
@@ -974,17 +975,16 @@ DECLARE_OOXMLEXPORT_TEST(testFdo65718, fdo65718.docx)
// the actual attributes where 'distT', 'distB', 'distL', 'distR'
uno::Referencebeans::XPropertySet xPropertySet(getShape(1),
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(0) ),
getPropertysal_Int32(xPropertySet, TopMargin) );
-CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(0) ),
getPropertysal_Int32(xPropertySet, BottomMargin) );
+CPPUNIT_ASSERT_EQUAL(sal_Int32( oox::drawingml::convertEmuToHmm(0) ),
getPropertysal_Int32(xPropertySet, TopMargin) );
+CPPUNIT_ASSERT_EQUAL(sal_Int32( oox::drawingml::convertEmuToHmm(0) ),
getPropertysal_Int32(xPropertySet, BottomMargin) );
-// Going to do '+1' because the 'getProperty' return 318 (instead of 317.5)
+// 'getProperty' return 318 (instead of 317.5)
// I think this is because it returns an integer, instead of a float.
// The actual exporting to DOCX exports the correct value (114300 = 317.5
* 360)
// The exporting to DOCX uses the 'SvxLRSpacing' that stores the value in
TWIPS (180 TWIPS)
// However, the 'LeftMargin' property is an integer property that holds
that value in 'MM100' (should hold 317.5, but it is 318)
-// So I had to add the hack of the '+1' to make the test-case pass
-CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(114300) + 1 ),
getPropertysal_Int32(xPropertySet, LeftMargin) );
-CPPUNIT_ASSERT_EQUAL(sal_Int32( EMU_TO_MM100(114300) + 1),
getPropertysal_Int32(xPropertySet, RightMargin) );
+CPPUNIT_ASSERT_EQUAL(sal_Int32( oox::drawingml::convertEmuToHmm(114300) ),
getPropertysal_Int32(xPropertySet, LeftMargin) );
+CPPUNIT_ASSERT_EQUAL(sal_Int32( oox::drawingml::convertEmuToHmm(114300) ),
getPropertysal_Int32(xPropertySet, RightMargin) );
}
DECLARE_OOXMLEXPORT_TEST(testFdo64350, fdo64350.docx)
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 27fe3d6..0c095e3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -64,6 +64,7 @@
#include com/sun/star/text/GraphicCrop.hpp
#include swtypes.hxx
#include tools/datetimeutils.hxx
+#include oox/drawingml/drawingmltypes.hxx
#include bordertest.hxx
@@ -1216,7 +1217,7 @@ DECLARE_OOXMLIMPORT_TEST(testfdo78904, fdo78904.docx)
if (xIndexAccess-getCount())
{
uno::Referencebeans::XPropertySet
xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(0)),
getPropertysal_Int32(xFrame, HoriOrientPosition));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(oox::drawingml::convertEmuToHmm(0)),
getPropertysal_Int32(xFrame, HoriOrientPosition));
}
}
@@ -1381,7 +1382,7 @@ DECLARE_OOXMLIMPORT_TEST(testFdo43641, fdo43641.docx)
uno::Referencecontainer::XIndexAccess xGroupShape(getShape(1),
uno::UNO_QUERY);
uno::Referencedrawing::XShape xLine(xGroupShape-getByIndex(1),
uno::UNO_QUERY);
// This was 2200, not 2579 in mm100, i.e. the size of the line shape was
incorrect.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(928694)),
xLine-getSize().Width);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(oox::drawingml::convertEmuToHmm(928440)),
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx|1 -
vcl/source/gdi/bitmap.cxx |6 --
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit a81027b13f1696c1cb2e8bcae3d712a193ff2dfd
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Fri Nov 21 19:12:38 2014 +1100
vcl: remove ::Bitmap as friend of OutputDevice
Change-Id: Idea0fee1ca79ae1660e89ef7038b35cf27358082
Reviewed-on: https://gerrit.libreoffice.org/13013
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e1a9ca4..ac8462a 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -255,7 +255,6 @@ extern const sal_uLong nVCLLut[ 256 ];
class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
{
-friend class ::Bitmap;
friend class ImplImageBmp;
friend class Printer;
friend class System;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index c034b27..69a6ecf 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1745,11 +1745,13 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice*
pDisplay )
{
Bitmap aDispBmp( *this );
-if( mpImpBmp ( pDisplay-mpGraphics || pDisplay-AcquireGraphics() ) )
+SalGraphics* pDispGraphics = pDisplay-GetGraphics();
+
+if( mpImpBmp pDispGraphics )
{
ImpBitmap* pImpDispBmp = new ImpBitmap;
-if( pImpDispBmp-ImplCreate( *mpImpBmp, pDisplay-mpGraphics ) )
+if( pImpDispBmp-ImplCreate( *mpImpBmp, pDispGraphics ) )
aDispBmp.ImplSetImpBitmap( pImpDispBmp );
else
delete pImpDispBmp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||69593 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|69593 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|72776 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||72776 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/svx svx/source
include/svx/sdasitm.hxx | 22 ++
svx/source/items/customshapeitem.cxx | 31 ++-
2 files changed, 32 insertions(+), 21 deletions(-)
New commits:
commit 7fcbb29db802acd8c0f32e8ff578ef4b2f82c46b
Author: Michael Stahl mst...@redhat.com
Date: Sat Nov 22 00:21:19 2014 +0100
svx: punish evil-doers who put duplicate properties into custom shapes
LO 4.3.2.2 is evidently able to export an ODF document that violates
XML Well-formedness constraint: Unique Att Spec.
draw:enhanced-geometry
draw:mirror-horizontal=false
draw:mirror-vertical=false
svg:viewBox=0 0 21679 2134682997
draw:text-areas=0 0 ?f3 ?f2
draw:mirror-vertical=true
draw:type=ooxml-rect
draw:enhanced-path=M 0 0 L ?f3 0 ?f3 ?f2 0 ?f2 Z N
Not sure how to reproduce this, but the attributes there are apparently a
serialization of SdrCustomShapeGeometryItem's aPropSeq,
retrieved from a CustomShapeGeometry property, so add some input
validation and assertions there.
Change-Id: I91151365b507779a4bdc9cce2057d34f2376f005
diff --git a/svx/source/items/customshapeitem.cxx
b/svx/source/items/customshapeitem.cxx
index eae790d..cb6e1fa 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -46,7 +46,14 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem(
const uno::Sequence bea
for ( i = 0; i aPropSeq.getLength(); i++ )
{
beans::PropertyValue rPropVal = aPropSeq[ i ];
-aPropHashMap[ rPropVal.Name ] = i;
+std::pairPropertyHashMap::iterator, bool const ret(
+aPropHashMap.insert(std::make_pair(rPropVal.Name, i)));
+assert(ret.second); // serious bug: duplicate xml attribute exported
+if (!ret.second)
+{
+throw uno::RuntimeException(
+CustomShapeGeometry has duplicate property + rPropVal.Name);
+}
if ( rPropVal.Value.getValueType() == ::getCppuType((const
::com::sun::star::uno::Sequence beans::PropertyValue *)0) )
{
uno::Sequence beans::PropertyValue rPropSeq = *(
uno::Sequence beans::PropertyValue *)rPropVal.Value.getValue();
@@ -148,6 +155,9 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
com::sun::star::beans::
}
else
{ // it's a new property
+assert(aPropSeq.end() == std::find_if(aPropSeq.begin(), aPropSeq.end(),
+[rPropVal](beans::PropertyValue const rVal)
+{ return rVal.Name == rPropVal.Name; } ));
sal_uInt32 nIndex = aPropSeq.getLength();
aPropSeq.realloc( nIndex + 1 );
aPropSeq[ nIndex ] = rPropVal ;
@@ -171,6 +181,9 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const
OUString rSequenceName
aValue.Name = rSequenceName;
aValue.Value = ::com::sun::star::uno::makeAny( aSeq );
+assert(aPropSeq.end() == std::find_if(aPropSeq.begin(),
aPropSeq.end(),
+[rSequenceName](beans::PropertyValue const rV)
+{ return rV.Name == rSequenceName; } ));
sal_uInt32 nIndex = aPropSeq.getLength();
aPropSeq.realloc( nIndex + 1 );
aPropSeq[ nIndex ] = aValue;
@@ -316,7 +329,23 @@ bool SdrCustomShapeGeometryItem::PutValue( const uno::Any
rVal, sal_uInt8 /*nMe
if ( ! ( rVal = aPropSeq ) )
return false;
else
+{
+for (sal_Int32 i = 0; i aPropSeq.getLength(); ++i)
+{
+for (sal_Int32 j = i+1; j aPropSeq.getLength(); ++j)
+{
+if (aPropSeq[i].Name == aPropSeq[j].Name)
+{
+assert(0); // serious bug: duplicate xml attribute exported
+OUString const name(aPropSeq[i].Name);
+aPropSeq.realloc(0);
+throw uno::RuntimeException(
+CustomShapeGeometry has duplicate property + name);
+}
+}
+}
return true;
+}
}
SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem()
commit df3c5583a0354a0110df033145c05b1fd08e9582
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 21 23:42:21 2014 +0100
svx: remove some pointless default implemented operator== structs
Change-Id: I792af21b0164fed4b2e22a1f95c3898ec631a25b
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 5255bcd..6ecb277 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -49,20 +49,12 @@ public:
typedef std::pair const OUString, const OUString PropertyPair;
private:
-struct SVX_DLLPUBLIC PropertyEq
-{
-bool operator()( const OUString, const OUString ) const;
-};
-struct SVX_DLLPUBLIC PropertyPairEq
-{
-bool operator()( const SdrCustomShapeGeometryItem::PropertyPair,
const SdrCustomShapeGeometryItem::PropertyPair ) const;
-};
[ANN] LIbreOffice 4.4.0 Beta1 available
Dear Community, The Document Foundation is pleased to announce the first Beta release of LibreOffice 4.4.0. The upcoming 4.4.0 will be the ninth major release of LibreOffice, coming with a bunch of new features beside the usual bugfixes. The Beta1 can be installed alongside the stable version, so feel free to give it a try. Beta1 is not ready for production yet, and while Beta1 marks feature freeze, final UI and string freeze is yet to come, and translations are not complete. A work-in-progress list of new features in LibreOffice 4.4 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.4 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.4.0 Beta1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.4.0/Beta1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Minutes of the Design Hangout: 2014-11-19
* Present: Ahmed, Jay, Heiko, Kendy, Stuart * Completed Action Items: + Kendy: Switch Sifr to be the default icon set on OS X + Jay: Check if the toolbar is not too wide after the recent changes + Jay: Gallery tooltip reverted + Jay: Sync the track changes shortcut with MSO + change the edit mode shortcut + Jay: Collect problematic .uno: commands in Draw/Impress (where slides are called pages and vice versa) + Ahmed: Get access to the new Sifr github repo * Pending Action Items: + Kendy: Create Easy Hack for images.zip layering (if it does not exist yet) + And also Easy Hack for downloading additional themes? + Kendy: GSoC task (or so) for converting Manage Changes... to sidebar (instead of non-modal dialog) + Kendy: Adjust alignment and spacing in line spacing drop down - https://bugs.freedesktop.org/show_bug.cgi?id=83076#c11 + Kendy: Sidebar - hide the decks, but keep the sidebar (only the icons) there. https://bugs.freedesktop.org/show_bug.cgi?id=85935 + might make sense to do the same thing in Calc - Styles button is gone in the toolbar too + Samuel: Add Close menu entry in the sidebar's menu that acts like View - Sidebar toggle https://bugs.freedesktop.org/show_bug.cgi?id=85937 + Jay: Tweet / G+ / ... about the conference logo need + Kendy: Do / find someone / easy-hack-ize automatic opening of the Track changes toolbar when we are tracking changes * UI changes integrated the last week: + More fixes to Calc toolbar (Jay) https://bugs.freedesktop.org/show_bug.cgi?id=85594 + Additional fixes to Impress toolbar and new revamp of Draw (Jay) https://bugs.freedesktop.org/show_bug.cgi?id=84909 + Swapping increase and decrease buttons in Sidebar (Jay) https://bugs.freedesktop.org/show_bug.cgi?id=85776 + Default to Sifr icon set on OS X (Kendy) + Many Sifr icons updated and added (Papamatti, Jay) + Improvements in various dialogs (Adolfo) + Addition of new and updated tango icons (Alex, Jay) * Last week's discussions that need a resolution: + Merge Document being outside of the Track Changes submenu (Jay, Cor) https://bugs.freedesktop.org/show_bug.cgi?id=85046 + there was no disagreement in the meeting, but then Cor updated the etherpad that he does not agree :-) + tried this feature, and actually it is either broken, or really bad from UX point of view (Kendy) + got the explanation from Jay + and seems pretty much misnamed :-) (Jay, Kendy) + Sophie agreed with the change in comment 34 + Cor stated he'd file an official protest and reverted the change in another bug report https://bugs.freedesktop.org/show_bug.cgi?id=86252 + suggestions of other names for the feature (Jay) + Merge Other Changes... (Jay) + Import Other Changes... ? (Kendy) + leaving it for another time, needs more work anyway (Jay) + Placement of header and footer (Jay) https://bugs.freedesktop.org/show_bug.cgi?id=86440 + different places in all Writer / Calc / Impress! + suggests under Insert (Jay) + or Edit (Cor) + but not View + one more option: Format (Stuart) + competitive analysis: MSO (Word, Excel) has it in 'Insert', Calligra in 'Create', Pages don't have that in the menu, WordPerfect has it in 'Insert' + apparently they have it tight to the creation/insertion functionality + would change the behavior a bit (Heiko) + yes, functionality is different across apps (Stuart) + conclusion: let's be consistent with the other apps out there (Kendy) AI + please move Impress Calc entries to Insert to be consistent (Jay) + overall, using this functionality from the menu is not ideal (all) + too confusing - why a submenu? (Heiko) + 'Character' or 'Font' (Jay) https://bugs.freedesktop.org/show_bug.cgi?id=86302 + apparently Word really leads to a dialog that only sets the font (Kendy) + but here we allow to set more - all the character properties + conclusion: Let's leave it as it is AI + close bug 86302 as wontfix (Jay) * Survey to revamp Calc toolbar (Jay, Heiko) + http://user-prompt.com/how-do-you-want-libreoffice-calcs-toolbar-configured/ + results - https://docs.google.com/document/d/1A0-40WnOk4099N3DPiQs36d5Od9Bxuc3cCpIhIb6Qe8/edit?pli=1 + shows that the biggest area of improvement needs to be of style and having predefined ones + alignment, font size etc. used quite a lot + border color used a lot too + many people do not know about styles in Calc + and people don't use that much + suggestion: more
Minutes of the ESC call: 2014-11-20
* Present: + Muthu, cloph, Lionel, David, Stephan, Kohei, Markus, Miklos, Kendy, Caolan, Eike, Robinson, Bjoern, Michael S, Norbert, Jan-Marek * Completed Action Items: + tweak autogen.sh to not add --best-effort (needed for Jenkins) (Michael M) - done * Pending Action Items: + look at regressions associated with a SUSE bugzilla bugfix (Timar) + look at sorting spreadsheet / use-cases etc. (Eike) cf. https://bugs.freedesktop.org/attachment.cgi?id=108990 ] ongoing, a mix of real bugs, wrong expectations and misconception about references * Release Engineering update (Cloph) + 4.3.5 RC1 due next week (previously called 4.3.4) + just re-numbered the schedule + have nice chart - Thunderbird/elsewhere mail/HTML copy/paste patch (Muthu) + review appreciated: https://gerrit.libreoffice.org/#/c/11911/ + done - thank you! + 4.4.0 Beta 1 / Feature Freeze / adjust ? + msm build problem fixed + re-occurence of a problem from March this year + will take one more last minute fix + will branch after the updated translations are in + Kendy would still like to push one thing there + ~1 hour needed + Moggi has a patch he'd like to get in too + but will take more than ~hour + late feature then + Recent Features ( fun ? ) + expat - libxml2 sax2 - 10% ? (Lubos) + threaded package2 / zipping (Matus) + threaded XLS[X] XclExpRow export win - ~20% (Michael) + bogus image compression avoidance (Matus) + calc bulk sliding window dep. tracking (Kohei) + Lateish Feature collection: + OpenGL rendering for Windows by default for good drivers (various) + CloudOn really waiting for the OpenGL work (Ptyl) + ongoing gerrit patch submissions + chart related patches in gerrit - fear factor (Kohei) + a queue of UX guys patches - modifying toolbars (Moggi) + good review before the feature freeze. + Android / iOS Remote + will update the support library + new Android UI; but minor otherwise * Crashtest update (Markus) + futures / Manitu ordering update ? + migrated to a new host - 32 cores + started a test run yesterday evening - unfortunately shut down due to maintenance + takes 1 day now + Java processes during valitation biting us + threaded, load ~70 for 32 cores + when stable, will run a test with asan + memory access problems etc. + will provide the list of those that crash only with asan * Hackfests + Toulouse Hackfest (Arnaud) + how it went? + well organized, thank you! + http://lefevre00.wordpress.com/2014/11/17/back-from-toulouse/ + https://people.gnome.org/~michael/blog/2014-11-15.html https://people.gnome.org/~michael/blog/2014-11-16.html + people from an associated conference joined + interested in accessibility, UI, etc. + Munich hack-fest [ This Weekend ! ] (Jan-Marek): http://www.it-muenchen-blog.de/2014/07/bug-squashing-party-2014/ + jmux (IRC) can add you if you don't want to create an account + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + 35 or so registrations - looking fun. + still ~5 places, you can join! + Need further offers [!] ... (Bjoern) + propose Collabora / Cambridge (Michael) + should consider Las Palmas de Gran Canaria/University again (Bjoern) + Freiburg - also an option (prolly better in summer anyway (Bjoern) * Bughunting session + this weekend + Tokio: http://naruoga-en.blogspot.de/2014/11/preparing-next-libreoffice-hackfest-as.html + on IRC: https://wiki.documentfoundation.org/BugHunting_Session_4.4.0.0 * FOSDEM bits + https://penta.fosdem.org/submission/FOSDEM15 + 20 minute slots (good to collect talks) + please consider filing by mid. December ! + Volunteer needed to book / run the hackfest afterwards. + who did it the last year? - Mirek AI + Cor had some good relationship with the BetaCowork? - ask him (Kendy) * UX Update (Kendy) + load of things sorted out, went to master + calc toolbar blogpost soon + sifr icons by default on Mac * Certification (Stephan/Bjoern/Kendy) + page updated. * Bugzilla migration update (Robinson) + Testing BSA + currently needs RPC with fdo, connecting that to our instance login broken against fdo instance right now - https://github.com/tdf/www-bugassistant/pull/42#issuecomment-62758516 + Increased volunteer interest in extending Bugzilla + got input from them
[Libreoffice-commits] core.git: basctl/source
basctl/source/dlged/dlged.cxx | 11 ---
basctl/source/inc/dlged.hxx |2 --
2 files changed, 13 deletions(-)
New commits:
commit 371c549b4921f7ac7bb336a1308b4fb14b9324ae
Author: Tobias Madl tobias.madl@gmail.com
Date: Fri Nov 21 21:16:47 2014 +
timers: Timer never started, remove it completely.
Change-Id: I119529498f4bea014e5e0d3d81c39203080ff1c4
Reviewed-on: https://gerrit.libreoffice.org/13030
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index b6d525c..74c46e9 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -219,9 +219,6 @@ DlgEditor::DlgEditor (
m_ClipboardDataFlavorsResource[1].HumanPresentableName = Dialog 8.0 ;
m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType(
(const Sequence sal_Int8 *) 0 );
-aPaintTimer.SetTimeout( 1 );
-aPaintTimer.SetTimeoutHdl( LINK( this, DlgEditor, PaintTimeout ) );
-
aMarkTimer.SetTimeout( 100 );
aMarkTimer.SetTimeoutHdl( LINK( this, DlgEditor, MarkTimeout ) );
@@ -249,7 +246,6 @@ DlgEditor::DlgEditor (
DlgEditor::~DlgEditor()
{
-aPaintTimer.Stop();
aMarkTimer.Stop();
::comphelper::disposeComponent( m_xControlContainer );
@@ -478,12 +474,7 @@ bool DlgEditor::KeyInput( const KeyEvent rKEvt )
void DlgEditor::Paint( const Rectangle rRect )
{
aPaintRect = rRect;
-PaintTimeout( aPaintTimer );
-}
-
-IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
-{
mnPaintGuard++;
Size aMacSize;
@@ -580,8 +571,6 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout)
}
mnPaintGuard--;
-
-return 0;
}
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 981bc08..5204262 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -100,7 +100,6 @@ public:
};
private:
-DECL_LINK(PaintTimeout, void *);
DECL_LINK(MarkTimeout, void *);
void Print( Printer* pPrinter, const OUString rTitle );
@@ -128,7 +127,6 @@ private:
boolbGridVisible;
boolbGridSnap;
boolbCreateOK;
-Timer aPaintTimer;
Rectangle aPaintRect;
boolbDialogModelChanged;
Timer aMarkTimer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/outdev.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit db93b490a65c7188bfc704948bc3a373cb3066e3
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Nov 22 11:11:32 2014 +1100
vcl: remove ImplImageBmp as friend of OutputDevice
Change-Id: Ia212aaa10840bae30508579e17ed8d2e9781c46d
Reviewed-on: https://gerrit.libreoffice.org/13035
Reviewed-by: Chris Sherlock chris.sherloc...@gmail.com
Tested-by: Chris Sherlock chris.sherloc...@gmail.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index ac8462a..dfb7f4d 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -255,7 +255,6 @@ extern const sal_uLong nVCLLut[ 256 ];
class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
{
-friend class ImplImageBmp;
friend class Printer;
friend class System;
friend class VirtualDevice;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source
sc/inc/column.hxx | 12 ++-- sc/inc/document.hxx |1 + sc/inc/sharedformula.hxx | 12 +--- sc/inc/table.hxx |4 +++- sc/source/core/data/bcaslot.cxx |1 + sc/source/core/data/column3.cxx | 16 sc/source/core/data/column4.cxx | 29 + sc/source/core/data/document.cxx | 17 + sc/source/core/data/document10.cxx| 17 + sc/source/core/data/table2.cxx| 18 +++--- sc/source/core/data/table7.cxx|8 sc/source/core/tool/sharedformula.cxx | 17 ++--- 12 files changed, 124 insertions(+), 28 deletions(-) New commits: commit c488dbfb60f057fd752e01c8a4ceabffcb22da40 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Nov 21 20:50:59 2014 -0500 Use group area listeners when deleting rows. Change-Id: I9ceb1cabf448349e087e4d5c4c2b1a75af91dd75 diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index e07c5ff..86fe906 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -229,7 +229,14 @@ public: boolTestInsertCol( SCROW nStartRow, SCROW nEndRow) const; bool TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow( SCROW nStartRow, SCSIZE nSize ); -voidDeleteRow( SCROW nStartRow, SCSIZE nSize ); + +/** + * @param nStartRow top row position + * @param nSize size of the segment to delete. + * @param pGroupPos when non-NULL, stores the top position of formula + * group that's been merged as a result of row deletion. + */ +void DeleteRow( SCROW nStartRow, SCSIZE nSize, std::vectorScAddress* pGroupPos = NULL ); void DeleteArea( SCROW nStartRow, SCROW nEndRow, InsertDeleteFlags nDelFlag, @@ -594,7 +601,7 @@ public: /** * Regroup formula cells for the entire column. */ -void RegroupFormulaCells(); +void RegroupFormulaCells( std::vectorScAddress* pGroupPos = NULL ); /** * Reset column position of formula cells within specified row range. @@ -669,6 +676,7 @@ private: void EndListeningIntersectedGroups( sc::EndListeningContext rCxt, SCROW nRow1, SCROW nRow2, std::vectorScAddress* pGroupPos = NULL ); +void EndListeningGroup( sc::EndListeningContext rCxt, SCROW nRow ); void SetNeedsListeningGroup( SCROW nRow ); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index acf0f67..f9f0310 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2182,6 +2182,7 @@ private: void EndListeningIntersectedGroups( sc::EndListeningContext rCxt, const ScRange rRange, std::vectorScAddress* pGroupPos = NULL ); +void EndListeningGroups( const std::vectorScAddress rPosArray ); void SetNeedsListeningGroups( const std::vectorScAddress rPosArray ); }; diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx index e1799bf..d94d8fe 100644 --- a/sc/inc/sharedformula.hxx +++ b/sc/inc/sharedformula.hxx @@ -82,17 +82,23 @@ public: * @param rPos position object of the first cell * @param rCell1 first cell * @param rCell2 second cell located immediately below the first cell. + * + * @return true if the cells are merged, false otherwise. If the two + * cells already belong to the same group, it returns false. */ -static void joinFormulaCells( -const CellStoreType::position_type rPos, ScFormulaCell rCell1, ScFormulaCell rCell2); +static bool joinFormulaCells( +const CellStoreType::position_type rPos, ScFormulaCell rCell1, ScFormulaCell rCell2 ); /** * Merge with an existing formula group (if any) located immediately above * if the cell at specified position is a formula cell, and its formula * tokens are identical to that of the above formula group. * * @param aPos position of cell to examine. + * + * @return true if the cells are merged, false otherwise. If the two + * cells already belong to the same group, it returns false. */ -static void joinFormulaCellAbove(const CellStoreType::position_type aPos); +static bool joinFormulaCellAbove( const CellStoreType::position_type aPos ); /** * Turn a shared formula cell into a non-shared one, and split it off from diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 56af841..0d0a5c4 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -403,7 +403,8 @@ public: bool TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ); void DeleteRow( -const sc::ColumnSet rRegroupCols, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, bool* pUndoOutline = NULL ); +const sc::ColumnSet rRegroupCols,
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/column.hxx | 12 ++-- sc/inc/document.hxx |1 + sc/inc/grouparealistener.hxx |6 ++ sc/inc/sharedformula.hxx | 12 +--- sc/inc/table.hxx |4 +++- sc/source/core/data/bcaslot.cxx | 29 +++-- sc/source/core/data/column3.cxx | 16 sc/source/core/data/column4.cxx | 29 + sc/source/core/data/document.cxx | 17 + sc/source/core/data/document10.cxx| 17 + sc/source/core/data/table2.cxx| 18 +++--- sc/source/core/data/table7.cxx|8 sc/source/core/tool/grouparealistener.cxx | 13 + sc/source/core/tool/sharedformula.cxx | 17 ++--- 14 files changed, 165 insertions(+), 34 deletions(-) New commits: commit 5432e2a5ef7a3e131d2496e19bd0c6a86955319f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Nov 21 20:50:59 2014 -0500 Use group area listeners when deleting rows. Change-Id: I9ceb1cabf448349e087e4d5c4c2b1a75af91dd75 diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 7c6b2cd..102af12 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -229,7 +229,14 @@ public: boolTestInsertCol( SCROW nStartRow, SCROW nEndRow) const; bool TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow( SCROW nStartRow, SCSIZE nSize ); -voidDeleteRow( SCROW nStartRow, SCSIZE nSize ); + +/** + * @param nStartRow top row position + * @param nSize size of the segment to delete. + * @param pGroupPos when non-NULL, stores the top position of formula + * group that's been merged as a result of row deletion. + */ +void DeleteRow( SCROW nStartRow, SCSIZE nSize, std::vectorScAddress* pGroupPos = NULL ); void DeleteArea( SCROW nStartRow, SCROW nEndRow, InsertDeleteFlags nDelFlag, @@ -592,7 +599,7 @@ public: /** * Regroup formula cells for the entire column. */ -void RegroupFormulaCells(); +void RegroupFormulaCells( std::vectorScAddress* pGroupPos = NULL ); /** * Reset column position of formula cells within specified row range. @@ -669,6 +676,7 @@ private: void EndListeningIntersectedGroups( sc::EndListeningContext rCxt, SCROW nRow1, SCROW nRow2, std::vectorScAddress* pGroupPos = NULL ); +void EndListeningGroup( sc::EndListeningContext rCxt, SCROW nRow ); void SetNeedsListeningGroup( SCROW nRow ); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 3dcdf08..554ee3a 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2183,6 +2183,7 @@ private: void EndListeningIntersectedGroups( sc::EndListeningContext rCxt, const ScRange rRange, std::vectorScAddress* pGroupPos = NULL ); +void EndListeningGroups( const std::vectorScAddress rPosArray ); void SetNeedsListeningGroups( const std::vectorScAddress rPosArray ); }; diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx index e1799bf..d94d8fe 100644 --- a/sc/inc/sharedformula.hxx +++ b/sc/inc/sharedformula.hxx @@ -82,17 +82,23 @@ public: * @param rPos position object of the first cell * @param rCell1 first cell * @param rCell2 second cell located immediately below the first cell. + * + * @return true if the cells are merged, false otherwise. If the two + * cells already belong to the same group, it returns false. */ -static void joinFormulaCells( -const CellStoreType::position_type rPos, ScFormulaCell rCell1, ScFormulaCell rCell2); +static bool joinFormulaCells( +const CellStoreType::position_type rPos, ScFormulaCell rCell1, ScFormulaCell rCell2 ); /** * Merge with an existing formula group (if any) located immediately above * if the cell at specified position is a formula cell, and its formula * tokens are identical to that of the above formula group. * * @param aPos position of cell to examine. + * + * @return true if the cells are merged, false otherwise. If the two + * cells already belong to the same group, it returns false. */ -static void joinFormulaCellAbove(const CellStoreType::position_type aPos); +static bool joinFormulaCellAbove( const CellStoreType::position_type aPos ); /** * Turn a shared formula cell into a non-shared one, and split it off from diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 56af841..0d0a5c4 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -403,7 +403,8 @@ public: bool TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize );
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sc/inc sc/source
sc/inc/column.hxx | 12 ++-- sc/inc/document.hxx |1 + sc/inc/grouparealistener.hxx |6 ++ sc/inc/sharedformula.hxx | 12 +--- sc/inc/table.hxx |4 +++- sc/source/core/data/bcaslot.cxx | 29 +++-- sc/source/core/data/column3.cxx | 16 sc/source/core/data/column4.cxx | 29 + sc/source/core/data/document.cxx | 17 + sc/source/core/data/document10.cxx| 17 + sc/source/core/data/table2.cxx| 18 +++--- sc/source/core/data/table7.cxx|8 sc/source/core/tool/grouparealistener.cxx | 13 + sc/source/core/tool/sharedformula.cxx | 17 ++--- 14 files changed, 165 insertions(+), 34 deletions(-) New commits: commit 5053f90f2229e1dffa5de08148f931faf8cdd744 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Nov 21 20:50:59 2014 -0500 Use group area listeners when deleting rows. Change-Id: I9ceb1cabf448349e087e4d5c4c2b1a75af91dd75 (cherry picked from commit 5432e2a5ef7a3e131d2496e19bd0c6a86955319f) diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 7c6b2cd..102af12 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -229,7 +229,14 @@ public: boolTestInsertCol( SCROW nStartRow, SCROW nEndRow) const; bool TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow( SCROW nStartRow, SCSIZE nSize ); -voidDeleteRow( SCROW nStartRow, SCSIZE nSize ); + +/** + * @param nStartRow top row position + * @param nSize size of the segment to delete. + * @param pGroupPos when non-NULL, stores the top position of formula + * group that's been merged as a result of row deletion. + */ +void DeleteRow( SCROW nStartRow, SCSIZE nSize, std::vectorScAddress* pGroupPos = NULL ); void DeleteArea( SCROW nStartRow, SCROW nEndRow, InsertDeleteFlags nDelFlag, @@ -592,7 +599,7 @@ public: /** * Regroup formula cells for the entire column. */ -void RegroupFormulaCells(); +void RegroupFormulaCells( std::vectorScAddress* pGroupPos = NULL ); /** * Reset column position of formula cells within specified row range. @@ -669,6 +676,7 @@ private: void EndListeningIntersectedGroups( sc::EndListeningContext rCxt, SCROW nRow1, SCROW nRow2, std::vectorScAddress* pGroupPos = NULL ); +void EndListeningGroup( sc::EndListeningContext rCxt, SCROW nRow ); void SetNeedsListeningGroup( SCROW nRow ); }; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 3dcdf08..554ee3a 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -2183,6 +2183,7 @@ private: void EndListeningIntersectedGroups( sc::EndListeningContext rCxt, const ScRange rRange, std::vectorScAddress* pGroupPos = NULL ); +void EndListeningGroups( const std::vectorScAddress rPosArray ); void SetNeedsListeningGroups( const std::vectorScAddress rPosArray ); }; diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx index e1799bf..d94d8fe 100644 --- a/sc/inc/sharedformula.hxx +++ b/sc/inc/sharedformula.hxx @@ -82,17 +82,23 @@ public: * @param rPos position object of the first cell * @param rCell1 first cell * @param rCell2 second cell located immediately below the first cell. + * + * @return true if the cells are merged, false otherwise. If the two + * cells already belong to the same group, it returns false. */ -static void joinFormulaCells( -const CellStoreType::position_type rPos, ScFormulaCell rCell1, ScFormulaCell rCell2); +static bool joinFormulaCells( +const CellStoreType::position_type rPos, ScFormulaCell rCell1, ScFormulaCell rCell2 ); /** * Merge with an existing formula group (if any) located immediately above * if the cell at specified position is a formula cell, and its formula * tokens are identical to that of the above formula group. * * @param aPos position of cell to examine. + * + * @return true if the cells are merged, false otherwise. If the two + * cells already belong to the same group, it returns false. */ -static void joinFormulaCellAbove(const CellStoreType::position_type aPos); +static bool joinFormulaCellAbove( const CellStoreType::position_type aPos ); /** * Turn a shared formula cell into a non-shared one, and split it off from diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 56af841..0d0a5c4 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -403,7 +403,8 @@ public: bool TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) const; voidInsertRow(
[Libreoffice-commits] core.git: include/sfx2 sfx2/Library_sfx.mk sfx2/source
include/sfx2/app.hxx|3 -- include/sfx2/mnuitem.hxx|1 sfx2/Library_sfx.mk |1 sfx2/source/appl/appinit.cxx|1 sfx2/source/appl/appquit.cxx|1 sfx2/source/appl/appreg.cxx |1 sfx2/source/appl/module.cxx |1 sfx2/source/control/ctrlfactoryimpl.cxx | 42 +++ sfx2/source/inc/ctrlfactoryimpl.hxx | 43 sfx2/source/menu/mnuitem.cxx|1 10 files changed, 93 insertions(+), 2 deletions(-) New commits: commit c2d11710716f3ec5696f3402951be0d7539fe376 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Nov 21 20:45:47 2014 -0500 Forward declare SfxMenuCtrlFactArr_Impl in sfx2/app.hxx public header. Change-Id: Iaf287912a52eb8785c687a13536fc170094425c7 diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index d0a0459..a9bff02 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -35,7 +35,6 @@ // header file because in former times SfxApplication was derived from it #include vcl/svapp.hxx -#include sfx2/mnuitem.hxx #include sfx2/shell.hxx #include sfx2/stbitem.hxx #include sfx2/tbxctrl.hxx @@ -62,7 +61,7 @@ class SfxEventConfiguration; class SfxEventHint; class SfxItemSet; class SfxMedium; -typedef boost::ptr_vectorSfxMenuCtrlFactory SfxMenuCtrlFactArr_Impl; +class SfxMenuCtrlFactArr_Impl; class SfxNewFileDialog; class SfxObjectShell; typedef ::std::vectorSfxObjectShell* SfxObjectShellArr_Impl; diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index ff0816e..0ddfe02 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -25,6 +25,7 @@ #include sal/config.h #include sfx2/ctrlitem.hxx #include sfx2/dllapi.h +#include tools/link.hxx class SfxVirtualMenu; class SfxBindings; diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 00c8781..0fc03c2 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -134,6 +134,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/config/evntconf \ sfx2/source/control/bindings \ sfx2/source/control/ctrlitem \ +sfx2/source/control/ctrlfactoryimpl \ sfx2/source/control/dispatch \ sfx2/source/control/itemdel \ sfx2/source/control/minfitem \ diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index a2d5d48..6238f5d 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -67,6 +67,7 @@ #include sfx2/fcontnr.hxx #include helper.hxx #include sfxpicklist.hxx +#include ctrlfactoryimpl.hxx using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index b601bfa..fb1771f0 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -54,6 +54,7 @@ #include sfx2/docfac.hxx #include appbaslib.hxx #include childwinimpl.hxx +#include ctrlfactoryimpl.hxx #include basic/basicmanagerrepository.hxx #include svtools/svtresid.hxx diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index e9c1e6e..923016d 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -34,6 +34,7 @@ #include partwnd.hxx #include sfx2/sfxsids.hrc #include recfloat.hxx +#include ctrlfactoryimpl.hxx #include sfx2/objsh.hxx #include sfx2/viewsh.hxx #include sfx2/objface.hxx diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 974276b..71c06b4 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -42,6 +42,7 @@ #define SfxModule #include sfxslots.hxx #include childwinimpl.hxx +#include ctrlfactoryimpl.hxx static SfxModuleArr_Impl* pModules=0; diff --git a/sfx2/source/control/ctrlfactoryimpl.cxx b/sfx2/source/control/ctrlfactoryimpl.cxx new file mode 100644 index 000..3e5fbf5 --- /dev/null +++ b/sfx2/source/control/ctrlfactoryimpl.cxx @@ -0,0 +1,42 @@ +/* -*- 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 . + */ + +#include ctrlfactoryimpl.hxx + +const
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/app.hxx|7 +
sfx2/source/appl/shutdowniconunx.cxx|1
sfx2/source/control/ctrlfactoryimpl.cxx | 40
sfx2/source/control/unoctitm.cxx|1
sfx2/source/inc/ctrlfactoryimpl.hxx | 30
sfx2/source/statbar/stbitem.cxx |1
sfx2/source/toolbox/tbxitem.cxx |1
sfx2/source/view/frame2.cxx |1
8 files changed, 77 insertions(+), 5 deletions(-)
New commits:
commit 483cff5e661aa40c8fd16d62eeb68cc29872eb4b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 22:17:04 2014 -0500
Forward declare SfxTbxCtrlFactArr_Impl and SfxStbCtrlFactArr_Impl in
app.hxx.
Now we can finally remove ptr_vector include from this header.
Change-Id: I7aeaa520e10b4eacb1a24ad666086739821e56b0
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index a9bff02..85a1acd 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -36,9 +36,6 @@
#include vcl/svapp.hxx
#include sfx2/shell.hxx
-#include sfx2/stbitem.hxx
-#include sfx2/tbxctrl.hxx
-#include boost/ptr_container/ptr_vector.hpp
#include vector
class Timer;
@@ -67,8 +64,8 @@ class SfxObjectShell;
typedef ::std::vectorSfxObjectShell* SfxObjectShellArr_Impl;
class SfxProgress;
class SfxSlotPool;
-typedef boost::ptr_vectorSfxStbCtrlFactory SfxStbCtrlFactArr_Impl;
-typedef boost::ptr_vectorSfxTbxCtrlFactory SfxTbxCtrlFactArr_Impl;
+class SfxStbCtrlFactArr_Impl;
+class SfxTbxCtrlFactArr_Impl;
class SfxViewFrame;
typedef ::std::vectorSfxViewFrame* SfxViewFrameArr_Impl;
class SfxViewShell;
diff --git a/sfx2/source/appl/shutdowniconunx.cxx
b/sfx2/source/appl/shutdowniconunx.cxx
index b716f56..746819d 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -26,6 +26,7 @@
#include gtk/gtk.h
#include glib.h
#include osl/mutex.hxx
+#include osl/module.hxx
#include vcl/bitmapex.hxx
#include vcl/bmpacc.hxx
#include tools/rc.hxx
diff --git a/sfx2/source/control/ctrlfactoryimpl.cxx
b/sfx2/source/control/ctrlfactoryimpl.cxx
index 3e5fbf5..9a877e1 100644
--- a/sfx2/source/control/ctrlfactoryimpl.cxx
+++ b/sfx2/source/control/ctrlfactoryimpl.cxx
@@ -39,4 +39,44 @@ size_t SfxMenuCtrlFactArr_Impl::size() const
return maData.size();
}
+const SfxStbCtrlFactory SfxStbCtrlFactArr_Impl::operator []( size_t i ) const
+{
+return maData[i];
+}
+
+SfxStbCtrlFactory SfxStbCtrlFactArr_Impl::operator []( size_t i )
+{
+return maData[i];
+}
+
+void SfxStbCtrlFactArr_Impl::push_back( SfxStbCtrlFactory* p )
+{
+maData.push_back(p);
+}
+
+size_t SfxStbCtrlFactArr_Impl::size() const
+{
+return maData.size();
+}
+
+const SfxTbxCtrlFactory SfxTbxCtrlFactArr_Impl::operator []( size_t i ) const
+{
+return maData[i];
+}
+
+SfxTbxCtrlFactory SfxTbxCtrlFactArr_Impl::operator []( size_t i )
+{
+return maData[i];
+}
+
+void SfxTbxCtrlFactArr_Impl::push_back( SfxTbxCtrlFactory* p )
+{
+maData.push_back(p);
+}
+
+size_t SfxTbxCtrlFactArr_Impl::size() const
+{
+return maData.size();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index b371e7a..ba0ea7c 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -66,6 +66,7 @@
#include boost/scoped_ptr.hpp
#include iostream
+#include map
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/inc/ctrlfactoryimpl.hxx
b/sfx2/source/inc/ctrlfactoryimpl.hxx
index a40f275..81feb31a 100644
--- a/sfx2/source/inc/ctrlfactoryimpl.hxx
+++ b/sfx2/source/inc/ctrlfactoryimpl.hxx
@@ -21,6 +21,8 @@
#define INCLUDED_SFX2_CTRLFACTORYIMPL_HXX
#include sfx2/mnuitem.hxx
+#include sfx2/stbitem.hxx
+#include sfx2/tbxctrl.hxx
#include boost/ptr_container/ptr_vector.hpp
@@ -38,6 +40,34 @@ public:
size_t size() const;
};
+class SfxStbCtrlFactArr_Impl
+{
+typedef boost::ptr_vectorSfxStbCtrlFactory DataType;
+DataType maData;
+
+public:
+const SfxStbCtrlFactory operator []( size_t i ) const;
+SfxStbCtrlFactory operator []( size_t i );
+
+void push_back( SfxStbCtrlFactory* p );
+
+size_t size() const;
+};
+
+class SfxTbxCtrlFactArr_Impl
+{
+typedef boost::ptr_vectorSfxTbxCtrlFactory DataType;
+DataType maData;
+
+public:
+const SfxTbxCtrlFactory operator []( size_t i ) const;
+SfxTbxCtrlFactory operator []( size_t i );
+
+void push_back( SfxTbxCtrlFactory* p );
+
+size_t size() const;
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index eeea72b6..fdea01e 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -46,6 +46,7 @@
#include svl/intitem.hxx
#include toolkit/helper/vclunohelper.hxx
#include toolkit/helper/convert.hxx
+#include
[Libreoffice-commits] core.git: include/sfx2 sfx2/Library_sfx.mk sfx2/source
include/sfx2/app.hxx |7 --
sfx2/Library_sfx.mk|1
sfx2/source/appl/appinit.cxx |1
sfx2/source/appl/appquit.cxx |1
sfx2/source/appl/shellimpl.cxx | 127 +
sfx2/source/doc/objxtor.cxx|1
sfx2/source/inc/shellimpl.hxx | 96 ++
sfx2/source/view/viewfrm.cxx |1
sfx2/source/view/viewsh.cxx|1
9 files changed, 232 insertions(+), 4 deletions(-)
New commits:
commit e59ae45fec5e65bea1bb5770d79a3f027e6adcf6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 22:57:41 2014 -0500
Forward declare all the std::vector based impl container classes.
Now #include vector is a goner...
Change-Id: Ia2da27bae5fadfa3f6f633e55fcedce405281b67
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 85a1acd..3673761 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -36,7 +36,6 @@
#include vcl/svapp.hxx
#include sfx2/shell.hxx
-#include vector
class Timer;
class WorkWindow;
@@ -61,15 +60,15 @@ class SfxMedium;
class SfxMenuCtrlFactArr_Impl;
class SfxNewFileDialog;
class SfxObjectShell;
-typedef ::std::vectorSfxObjectShell* SfxObjectShellArr_Impl;
+class SfxObjectShellArr_Impl;
class SfxProgress;
class SfxSlotPool;
class SfxStbCtrlFactArr_Impl;
class SfxTbxCtrlFactArr_Impl;
class SfxViewFrame;
-typedef ::std::vectorSfxViewFrame* SfxViewFrameArr_Impl;
+class SfxViewFrameArr_Impl;
class SfxViewShell;
-typedef ::std::vectorSfxViewShell* SfxViewShellArr_Impl;
+class SfxViewShellArr_Impl;
class StarBASIC;
class SfxWorkWindow;
class SfxFilterMatcher;
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 0fc03c2..0a1100e 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -117,6 +117,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/openuriexternally \
sfx2/source/appl/sfxhelp \
sfx2/source/appl/sfxpicklist \
+sfx2/source/appl/shellimpl \
sfx2/source/appl/shutdownicon \
sfx2/source/appl/workwin \
sfx2/source/appl/xpackcreator \
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 6238f5d..77067dd 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -68,6 +68,7 @@
#include helper.hxx
#include sfxpicklist.hxx
#include ctrlfactoryimpl.hxx
+#include shellimpl.hxx
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index fb1771f0..2367e51a 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -55,6 +55,7 @@
#include appbaslib.hxx
#include childwinimpl.hxx
#include ctrlfactoryimpl.hxx
+#include shellimpl.hxx
#include basic/basicmanagerrepository.hxx
#include svtools/svtresid.hxx
diff --git a/sfx2/source/appl/shellimpl.cxx b/sfx2/source/appl/shellimpl.cxx
new file mode 100644
index 000..84ed3de
--- /dev/null
+++ b/sfx2/source/appl/shellimpl.cxx
@@ -0,0 +1,127 @@
+/* -*- 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 .
+ */
+
+#include shellimpl.hxx
+
+SfxObjectShellArr_Impl::iterator SfxObjectShellArr_Impl::begin()
+{
+return maData.begin();
+}
+
+SfxObjectShellArr_Impl::iterator SfxObjectShellArr_Impl::end()
+{
+return maData.end();
+}
+
+const SfxObjectShell* SfxObjectShellArr_Impl::operator[] ( size_t i ) const
+{
+return maData[i];
+}
+
+SfxObjectShell* SfxObjectShellArr_Impl::operator[] ( size_t i )
+{
+return maData[i];
+}
+
+void SfxObjectShellArr_Impl::erase( iterator it )
+{
+maData.erase(it);
+}
+
+void SfxObjectShellArr_Impl::push_back( SfxObjectShell* p )
+{
+maData.push_back(p);
+}
+
+size_t SfxObjectShellArr_Impl::size() const
+{
+return maData.size();
+}
+
+SfxViewFrameArr_Impl::iterator SfxViewFrameArr_Impl::begin()
+{
+return maData.begin();
+}
+
+SfxViewFrameArr_Impl::iterator SfxViewFrameArr_Impl::end()
+{
+return maData.end();
+}
+
+const SfxViewFrame* SfxViewFrameArr_Impl::operator[] ( size_t i ) const
+{
+return maData[i];
+}
+
+SfxViewFrame*
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/drwtxtsh.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a08705e9346d95dcd5fb80e2cf6695091a04f883 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Nov 21 23:21:22 2014 -0500 Build fix. Change-Id: I786caf0d7d061fcc5d1b3fa57094eadebcbcf42c diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index fd6dff6..36defc2 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -71,6 +71,7 @@ #include svx/svxdlg.hxx #include svx/xtable.hxx #include cppuhelper/bootstrap.hxx +#include comphelper/processfactory.hxx #include swabstdlg.hxx #include misc.hrc #include boost/scoped_ptr.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source
include/sfx2/bindings.hxx| 28 +---
sfx2/source/control/bindings.cxx | 87 +++
2 files changed, 90 insertions(+), 25 deletions(-)
New commits:
commit 5859c63f93761130b0c8e836938ed6f9aa52c664
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 23:50:43 2014 -0500
Same with SfxUnoControllerArr_Impl.
Change-Id: I927621de8f4c486ef0f77ec6c8da336f36b38b3e
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index ad31b6a..ddae134 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -28,18 +28,13 @@
#include com/sun/star/frame/XDispatchProvider.hpp
#include com/sun/star/uno/Reference.h
#include com/sun/star/frame/XDispatchRecorderSupplier.hpp
-#include vector
-
// some other includes
-
#include sfx2/viewfrm.hxx
-
// forwards, typedefs, declarations
-
class SystemWindow;
class SfxSlot;
class SfxSlotServer;
@@ -54,8 +49,7 @@ class SfxWorkWindow;
class SfxUnoControllerItem;
struct SfxFoundCache_Impl;
class SfxFoundCacheArr_Impl;
-
-typedef std::vectorSfxUnoControllerItem* SfxUnoControllerArr_Impl;
+class SfxUnoControllerArr_Impl;
enum class SfxCallMode : sal_uInt16
{
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index db5ff60..76fca49 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -127,6 +127,51 @@ public:
}
};
+class SfxUnoControllerArr_Impl
+{
+typedef std::vectorSfxUnoControllerItem* DataType;
+DataType maData;
+
+public:
+
+typedef DataType::iterator iterator;
+
+iterator begin()
+{
+return maData.begin();
+}
+
+iterator end()
+{
+return maData.end();
+}
+
+void erase( iterator it )
+{
+maData.erase(it);
+}
+
+SfxUnoControllerItem* operator[] ( size_t i )
+{
+return maData[i];
+}
+
+const SfxUnoControllerItem* operator[] ( size_t i ) const
+{
+return maData[i];
+}
+
+size_t size() const
+{
+return maData.size();
+}
+
+void push_back( SfxUnoControllerItem* p )
+{
+maData.push_back(p);
+}
+};
+
class SfxAsyncExec_Impl
{
::com::sun::star::util::URL aCommand;
commit 6e385ffadd4842f28a51a1a490ea910cbee6ff4a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Nov 21 23:44:48 2014 -0500
Forward declare SfxFoundCacheArr_Impl and SfxFoundCache_Impl in
bindings.hxx.
And remove #include boost/ptr_container/ptr_vector.hpp from here.
Change-Id: I762b60ee19f0b5b19e7a7aab0210ddf90d7c
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 2fbe66d..ad31b6a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -29,7 +29,6 @@
#include com/sun/star/uno/Reference.h
#include com/sun/star/frame/XDispatchRecorderSupplier.hpp
#include vector
-#include boost/ptr_container/ptr_vector.hpp
// some other includes
@@ -53,6 +52,8 @@ class SfxBindings_Impl;
class Timer;
class SfxWorkWindow;
class SfxUnoControllerItem;
+struct SfxFoundCache_Impl;
+class SfxFoundCacheArr_Impl;
typedef std::vectorSfxUnoControllerItem* SfxUnoControllerArr_Impl;
@@ -97,23 +98,6 @@ enum SfxPopupAction
SFX_POPUP_SHOW
};
-struct SfxFoundCache_Impl
-{
-sal_uInt16 nSlotId; // the Slot-Id
-sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId
-const SfxSlot* pSlot; // Pointer to Master-Slot
-SfxStateCache* pCache;// Pointer to StatusCache, if possible NULL
-
-SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS,
SfxStateCache *pC ):
-nSlotId(nS),
-nWhichId(nW),
-pSlot(pS),
-pCache(pC)
-{}
-};
-
-typedef boost::ptr_vectorSfxFoundCache_Impl SfxFoundCacheArr_Impl;
-
class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster
/* [Description]
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 1b51608..db5ff60 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -66,6 +66,7 @@
#include com/sun/star/frame/XModuleManager.hpp
#include boost/scoped_array.hpp
#include boost/scoped_ptr.hpp
+#include boost/ptr_container/ptr_vector.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -83,7 +84,48 @@ typedef boost::unordered_map sal_uInt16, bool
InvalidateSlotMap;
typedef std::vectorSfxStateCache* SfxStateCacheArr_Impl;
+struct SfxFoundCache_Impl
+{
+sal_uInt16 nSlotId; // the Slot-Id
+sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId
+const SfxSlot* pSlot; // Pointer to Master-Slot
+SfxStateCache* pCache;// Pointer to StatusCache, if possible NULL
+
+SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS,
SfxStateCache *pC ):
+nSlotId(nS),
+nWhichId(nW),
+pSlot(pS),
+pCache(pC)
+{}
LibreOffice Gerrit News for dev-tools on 2014-11-22
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: None * Merged changes on master for project dev-tools changed in the last 25 hours: + libreoffice-bugzilla2.py: try to avoid modifying non-LO bugs in https://gerrit.libreoffice.org/12290 from Michael Stahl * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2014-11-22
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#85486 - Clean up unnecessary enumerations from xenum.hxx in https://gerrit.libreoffice.org/13029 from Ioan Radu about module cui, filter, include, sd, svx, sw + fdo#86440 move header and footer entry to insert menu in https://gerrit.libreoffice.org/13026 from Yousuf Philips about module sc, sd + fdo#86132 add tooltips to calc xcu file in https://gerrit.libreoffice.org/13023 from Yousuf Philips about module officecfg, sc + fdo#85594 enable conditional formatting button, add icons, and tooltips in https://gerrit.libreoffice.org/13021 from Yousuf Philips about module icon-themes, officecfg, sc + Second preparation of the LibreOfficeKit for Windows in https://gerrit.libreoffice.org/13017 from juegen funk about module include, smoketest + Removed useless includes in basctl/source/basicide/ tree in https://gerrit.libreoffice.org/12963 from Andrea Gelmini about module basctl + fdo#85486 - Clean up unnecessary enumerations from xenum.hxx in https://gerrit.libreoffice.org/12507 from Ioan Radu about module basctl, cui, filter, include, sd, svx, sw End of freshness + vcl: remove System as friend of OutputDevice in https://gerrit.libreoffice.org/13036 from Chris Sherlock about module include + vcl: change Timer and Idle to use boost's Signal2 in https://gerrit.libreoffice.org/12528 from Chris Sherlock about module include, vcl + fdo#75256 Improve sifr icontheme in https://gerrit.libreoffice.org/13031 from Matthias Freund about module icon-themes + scp2: move ct2n to AutoInstall in https://gerrit.libreoffice.org/13020 from David Ostrovsky about module build, scp2 * Merged changes on master for project core changed in the last 25 hours: + vcl: remove ImplImageBmp as friend of OutputDevice in https://gerrit.libreoffice.org/13035 from Chris Sherlock + timers: Timer never started, remove it completely. in https://gerrit.libreoffice.org/13030 from Tobias Madl + vcl: remove ::Bitmap as friend of OutputDevice in https://gerrit.libreoffice.org/13013 from Chris Sherlock + make glxtest available in salmain in https://gerrit.libreoffice.org/13014 from Markus Mohrhard + HIG fixes for basctl in https://gerrit.libreoffice.org/12971 from Adolfo Jayme Barrientos + Use boost::signal in SmElementsControl in https://gerrit.libreoffice.org/12509 from Marcos Paulo de Souza + expand complex cascading conditional operator, step 5 in https://gerrit.libreoffice.org/13012 from Björn Michaelsen + vcl: remove Application as friend of OutputDevice in https://gerrit.libreoffice.org/12989 from Chris Sherlock + add sanity checking to --with-iwyu in https://gerrit.libreoffice.org/12988 from Noel Grandin + expand complex cascading conditional operator, step 2 in https://gerrit.libreoffice.org/13009 from Björn Michaelsen + expand complex cascading conditional operator, step 3 in https://gerrit.libreoffice.org/13010 from Björn Michaelsen + expand complex cascading conditional operator, step 4 in https://gerrit.libreoffice.org/13011 from Björn Michaelsen + expand complex cascading conditional operator in https://gerrit.libreoffice.org/13007 from Björn Michaelsen + expand complex cascading conditional operator in https://gerrit.libreoffice.org/13006 from Björn Michaelsen + expand complex cascading conditional operator, step 1 in https://gerrit.libreoffice.org/13008 from Björn Michaelsen * Abandoned changes on master for project core changed in the last 25 hours: + vcl: change Timer and Idle to use boost's Signal2 in https://gerrit.libreoffice.org/12950 from Chris Sherlock + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad * Open changes needing tweaks, but being untouched for more than a week: + Don’t Save -- Don't Save. in https://gerrit.libreoffice.org/12399 from Kevin Suo + fdo#77569 - Add Choose Theme to Format Menu in https://gerrit.libreoffice.org/12275 from Joel Madero + Perftest for loading autocorrect dictionaries, related fdo#79761 in https://gerrit.libreoffice.org/11296 from Matúš Kukan + android: Show document browser back in the menu in https://gerrit.libreoffice.org/12108 from Jacobo Aragunde Pérez + coverity#1242459 Identical code for different branches in https://gerrit.libreoffice.org/11772 from Caolán McNamara + jvmfwk: Apple Oracle's JRE detection for OS X 10.8+ in https://gerrit.libreoffice.org/12057 from Robert Antoni Buj i Gelonch + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + WIP: fdo#43090: Add an option to disable autoclose brackets in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#58194 - export DOCX Automatic indent as
RE: Who knows of a free UML tool to work with libreoffice?
At times it can help track down the 'has a and is a relationships. Anyone used a free UML with libreoffice..that proved a good tool? From: nicholas ferguson [mailto:nicholasfergu...@wingarch.com] Sent: Friday, November 21, 2014 8:13 AM To: 'libreoffice@lists.freedesktop.org' Subject: Who knows of a free UML tool to work with libreoffice? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] [ANN] LibreOffice 4.4.0 beta1 test builds available
Hi *, for the upcoming new version 4.4.0, the builds for beta1 are now available on pre-releases. 4.4.0 is scheduled to be released end of January While the build is made available in all supported languages and translation templates were updated, translation did just start and thus is still incomplete. See https://wiki.documentfoundation.org/ReleasePlan/4.4#4.4.0_release for the complete schedule. Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.4.0 alpha2 is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-4-release-4.4.0.0.beta1.log The list of fixed bugs relative from 4.4.0 alpha1 to 4.3.3 final and alpha1 to alpha2 are here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-master-release-4.4.0.0.alpha1.log http://dev-builds.libreoffice.org/pre-releases/src/bugs-master-release-4.4.0.0.alpha2.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] test cases in MozTrap
Hi, MozTrap has test cases for 4.4.0 Alpha 2, but we already have the beta 1 build. Could anyone do the test cases for beta1, please? Thank you Lera ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] test cases in MozTrap
Hi all, Le 21/11/2014 12:30, Lera Goncharuk a écrit : Hi, MozTrap has test cases for 4.4.0 Alpha 2, but we already have the beta 1 build. Could anyone do the test cases for beta1, please? The run has been renamed to Beta1 Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Co-founder - Release coordinator The Document Foundation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] 4.0.0.0 beta1 version in bugzilla missing
so please add it to the dropdown menu bye, Tommy -- Using Opera's revolutionary email client: http://www.opera.com/mail/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANN] LIbreOffice 4.4.0 Beta1 available
Dear Community, The Document Foundation is pleased to announce the first Beta release of LibreOffice 4.4.0. The upcoming 4.4.0 will be the ninth major release of LibreOffice, coming with a bunch of new features beside the usual bugfixes. The Beta1 can be installed alongside the stable version, so feel free to give it a try. Beta1 is not ready for production yet, and while Beta1 marks feature freeze, final UI and string freeze is yet to come, and translations are not complete. A work-in-progress list of new features in LibreOffice 4.4 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.4 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.4.0 Beta1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.4.0/Beta1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 86390] File Type List has no scrollbar
https://bugs.freedesktop.org/show_bug.cgi?id=86390 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85904] html export miss force external / embedded images option
https://bugs.freedesktop.org/show_bug.cgi?id=85904 Marco Ciampa ciam...@libero.it changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Marco Ciampa ciam...@libero.it --- Keep in mind that the HTML exporter, now loses data. Infact if you have a document with locally stored linked images (instead of embedded) the html produced document embeds all images, losing all filenames. If you manage to extract the images from the produced html output exported by LibO by means of an external filter/tool, you can't recover file names and this is _bad_. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85904] html export miss force external / embedded images option
https://bugs.freedesktop.org/show_bug.cgi?id=85904 Marco Ciampa ciam...@libero.it changed: What|Removed |Added Severity|enhancement |minor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 85904] html export miss force external / embedded images option
https://bugs.freedesktop.org/show_bug.cgi?id=85904 Marco Ciampa ciam...@libero.it changed: What|Removed |Added Version|unspecified |Inherited From OOo -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
