[Libreoffice-commits] core.git: include/editeng
include/editeng/editdata.hxx | 38 ++
1 file changed, 14 insertions(+), 24 deletions(-)
New commits:
commit 853fe648a7efd7c7470283add66f2dfa254e03e4
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 23 09:23:24 2014 +0100
bool improvements
Change-Id: I6c2b4a825fffc015f10ef016e239b379a90ad768
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 6c2158b..2e16717 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -143,54 +143,44 @@ struct ESelection
}
voidAdjust();
-sal_BoolIsEqual( const ESelection rS ) const;
-sal_BoolIsLess( const ESelection rS ) const;
-sal_BoolIsGreater( const ESelection rS ) const;
-sal_BoolIsZero() const;
-sal_BoolHasRange() const;
+boolIsEqual( const ESelection rS ) const;
+boolIsLess( const ESelection rS ) const;
+boolIsGreater( const ESelection rS ) const;
+boolIsZero() const;
+boolHasRange() const;
};
-inline sal_Bool ESelection::HasRange() const
+inline bool ESelection::HasRange() const
{
return ( nStartPara != nEndPara ) || ( nStartPos != nEndPos );
}
-inline sal_Bool ESelection::IsZero() const
+inline bool ESelection::IsZero() const
{
return ( ( nStartPara == 0 ) ( nStartPos == 0 )
( nEndPara == 0 ) ( nEndPos == 0 ) );
}
-inline sal_Bool ESelection::IsEqual( const ESelection rS ) const
+inline bool ESelection::IsEqual( const ESelection rS ) const
{
return ( ( nStartPara == rS.nStartPara ) ( nStartPos == rS.nStartPos )
( nEndPara == rS.nEndPara ) ( nEndPos == rS.nEndPos ) );
}
-inline sal_Bool ESelection::IsLess( const ESelection rS ) const
+inline bool ESelection::IsLess( const ESelection rS ) const
{
// The selection must be adjusted.
// = Only check if end of 'this' Start of rS
-
-if ( ( nEndPara rS.nStartPara ) ||
- ( ( nEndPara == rS.nStartPara ) ( nEndPos rS.nStartPos )
!IsEqual( rS ) ) )
-{
-return sal_True;
-}
-return sal_False;
+return ( nEndPara rS.nStartPara ) ||
+( ( nEndPara == rS.nStartPara ) ( nEndPos rS.nStartPos )
!IsEqual( rS ) );
}
-inline sal_Bool ESelection::IsGreater( const ESelection rS ) const
+inline bool ESelection::IsGreater( const ESelection rS ) const
{
// The selection must be adjusted.
// = Only check if end of 'this' Start of rS
-
-if ( ( nStartPara rS.nEndPara ) ||
- ( ( nStartPara == rS.nEndPara ) ( nStartPos rS.nEndPos )
!IsEqual( rS ) ) )
-{
-return sal_True;
-}
-return sal_False;
+return ( nStartPara rS.nEndPara ) ||
+( ( nStartPara == rS.nEndPara ) ( nStartPos rS.nEndPos )
!IsEqual( rS ) );
}
inline void ESelection::Adjust()
___
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/svapp.hxx | 163 +++---
1 file changed, 142 insertions(+), 21 deletions(-)
New commits:
commit a9f0b3bd33f93c4066ae9b38241c5cf67f6f4a46
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Wed Jan 22 18:18:15 2014 +1100
Document more of VCL's Application class
* Documented the Application class's settings functions. When
reading through the code, I have noticed that GetSettings
intializes the application settings (!) and that SetSettings
relies on GetSettings to initialize the settings (!), so I
have listed a todo entry.
Furthermore, I've also noticed that SetSystemSettings and
MergeSystemSettings may be confused with the purpose of
SetSettings so I've added a todo entry that recommends that
we return an AllSettings object and make the parameters const.
* Minor whitespace changes
* Update @see for a number of public functions
* Group functions into Doxygen modules
Change-Id: I48f8d21a5d6436a2ae545e5156b877d57a8bc585
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index f0fe3ca..05d982a 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -268,7 +268,10 @@ public:
*/
virtual voidUserEvent( sal_uLong nEvent, void* pEventData
);
-// Functions that notify when changes occur in the application
+/** @defgroup changes Change notification functions
+Functions that notify when changes occur in the application
+@{
+*/
/** Notify that the application is no longer the focused (or current)
application - needed for Windowing systems where an end user can switch
@@ -287,7 +290,12 @@ public:
*/
virtual voidDataChanged( const DataChangedEvent rDCEvt );
-// Initialization functions
+/** @} */ // end of changes
+
+/** @defgroup Initialization
+Initialization functions
+@{
+*/
/** Initialize the application itself.
@@ -313,7 +321,12 @@ public:
*/
virtual voidDeInit();
-// Command line processing:
+/** @} */ // end of Initialization
+
+
+/** @defgroup CommandLine Command line processing
+@{
+*/
/** Gets the number of command line parameters passed to the application
@@ -341,7 +354,12 @@ public:
*/
static OUString GetAppFileName();
-// Error handling
+/** @} */ // end of CommandLine
+
+/** @defgroup ErrorHandling Error handling
+@{
+*/
+
/** Handles an error code.
@remark This is not actually an exception. It merely takes an
@@ -369,13 +387,18 @@ public:
*/
static void Abort( const OUString rErrorText );
-// Event loop functions:
+/** @} */ // end of CommandLine
+
+/** @defgroup EventLoop Event loop functions
+@{
+*/
/** Run the main event processing loop until it is quit by @Quit.
@see Quit, Reschedule, Yield, EndYield, GetSolarMutex,
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
- EnableNoYieldMode, AddPostYieldListener, RemovePostYieldListener
+ EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,
+ RemovePostYieldListener
*/
static void Execute();
@@ -383,7 +406,8 @@ public:
@see Execute, Reschedule, Yield, EndYield, GetSolarMutex,
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
- EnableNoYieldMode, AddPostYieldListener, RemovePostYieldListener
+ EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,
+ RemovePostYieldListener
*/
static void Quit();
@@ -395,8 +419,8 @@ public:
@see Execute, Quit, Yield, EndYield, GetSolarMutex,
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
- EnableNoYieldMode, AddPostYieldListener, RemovePostYieldListener
-
+ EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,
+ RemovePostYieldListener
*/
static void Reschedule( bool bAllEvents = false );
@@ -404,7 +428,8 @@ public:
@see Execute, Quit, Reschedule, EndYield, GetSolarMutex,
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
- EnableNoYieldMode, AddPostYieldListener, RemovePostYieldListener
+ EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,
+ RemovePostYieldListener
*/
static void Yield();
@@ -412,7 +437,8 @@ public:
@see Execute, Quit, Reschedule, Yield, GetSolarMutex,
GetMainThreadIdentifier, ReleaseSolarMutex, AcquireSolarMutex,
- EnableNoYieldMode, AddPostYieldListener, RemovePostYieldListener
+ EnableNoYieldMode, DisableNoYieldMode, AddPostYieldListener,
+ RemovePostYieldListener
*/
static void
Re: Efficient UNO component linkage GC ...
On Fri, 2014-01-17 at 10:18 +0100, Stephan Bergmann wrote: On 01/16/2014 06:52 PM, Stephan Bergmann wrote: So the way out is to distinguish singleton implementations (whose XML description lists at least one singleton ...) from normal ones (whose XML description does not list any singleton ...s), and let the service manager keep track to only create a single instance of those. And for those false singletons that are normal implementations by the preceding definition but use a single-instance factory, turn them into singleton implementations (typically by deprecating an existing UNOIDL service and introducing a superseding UNOIDL singleton), and, voila, you can convert them to use constructor functions without further ado. http://cgit.freedesktop.org/libreoffice/core/commit/?id=997d21183322a0a94b96868073808841d2773902 Support for singleton constructor functions implements the necessary machinery in the service manager, and http://cgit.freedesktop.org/libreoffice/core/commit/?id=997d21183322a0a94b96868073808841d2773902 Introduce com.sun.star.frame.theGlobalEventBroadcaster singleton and http://cgit.freedesktop.org/libreoffice/core/commit/?id=3557c07899e363a9b7e1cceca632ad9112d039a2 Revert 'Revert 'sfx: Use constructor feature for SfxGlobalEvents_Impl'' demonstrate how to apply it to SfxGlobaleEvent_Impl. Bummer. Where was my brains? This of course also requires http://cgit.freedesktop.org/libreoffice/core/commit/?id=d7a397ca101999a2910c9087d708e0a8c0ea4c2e Constructor functions for singletons still need to pass out single instances: Ah, so it seems that Singleton::get(context).instance does not work always. In framework, there are many one instance services, and when I tried to use static Singleton class in ctor function for e.g. framework::Desktop, I get various crashes on atexit. ...as they are not only called from the service manager (which takes care of singleton constructor functions since 997d21183322a0a94b96868073808841d2773902 Support for singleton constructor functions) but potentially also directly from cppumaker-generated code (which is the raison d'être for constructor functions, after all). AFAICS singletons in generated code don't use constructor functions yet. And maybe it's a good thing. We could use always context-getValueByName(/singletons/name); and it would work ? After changing css::uno::XInterface *inst = Singleton::get(context).instance.get(); inst-acquire(); return inst; back to return cppu::acquire(new SfxGlobalEvents_Impl(context)); However, this change: * postpones the instance's destruction to atexit, with all dreaded consequences; lets see how that pans out. yep, unfortunately it creates problems :-( * makes it questionable whether the service manager holding references of these singletons (introduced in 997d21183322a0a94b96868073808841d2773902) is necessary after all; lets revisit that in another commit. I would keep it, and use only that, unless you know how to fix it another way? I wish, there would be something simpler possible, because adding singleton deprecating the service for 13 services is not fun. Maybe something like you wrote ** or use some implementation single-instance=true flag in .component XML and implement the logic of holding a single instance in the service manager, which would dispose them when it gets disposed well ahead of exit but I guess this has the same effect as creating a singleton which is better thing to do ? Hope this email makes sense, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source include/vcl vcl/source
desktop/source/app/app.cxx |9 + include/vcl/settings.hxx|6 -- vcl/source/app/settings.cxx |5 + 3 files changed, 6 insertions(+), 14 deletions(-) New commits: commit 99dafea3e56e5d2b559352896a509bf7fa0fdab5 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Wed Jan 22 18:24:55 2014 +1100 Move defines into settings.hxx For some unknown reason, there are a bunch of defines in the middle of Desktop::SystemSettingsChanging() that should really be in include/vcl/settings.hxx. I have now moved DRAG_OPTIONS_ALL into settings.hxx but entirely removed DRAG_OPTIONS_NONE because it is confusing. I also removed it in the one place this combination of options is used in the Desktop class. I have also removed the options DRAG_OPTIONS_OBJECT_* from settings.hxx because they are used nowhere in the code. I have carefully looked through the code and nothing flips bits 0x0004 or 0x0008 on the private member of ImplStyleData's mnDragFullOptions in any way. Basically, it is safe to remove. Change-Id: Icf6268f940cfaed271bd43c977473fecfc726949 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 8c0fe6a..9b32f6c 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1938,13 +1938,6 @@ void Desktop::SystemSettingsChanging( AllSettings rSettings ) if ( !SvtTabAppearanceCfg::IsInitialized () ) return; -# define DRAGFULL_OPTION_ALL \ - ( DRAGFULL_OPTION_WINDOWMOVE | DRAGFULL_OPTION_WINDOWSIZE \ - | DRAGFULL_OPTION_OBJECTMOVE | DRAGFULL_OPTION_OBJECTSIZE \ - | DRAGFULL_OPTION_DOCKING | DRAGFULL_OPTION_SPLIT \ - | DRAGFULL_OPTION_SCROLL ) -# define DRAGFULL_OPTION_NONE ((sal_uInt32)~DRAGFULL_OPTION_ALL) - StyleSettings hStyleSettings = rSettings.GetStyleSettings(); MouseSettings hMouseSettings = rSettings.GetMouseSettings(); @@ -1958,7 +1951,7 @@ void Desktop::SystemSettingsChanging( AllSettings rSettings ) nDragFullOptions |= DRAGFULL_OPTION_ALL; break; case DragFrame: -nDragFullOptions = DRAGFULL_OPTION_NONE; +nDragFullOptions = ((sal_uInt32)~DRAGFULL_OPTION_ALL); break; case DragSystemDep: default: diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 6f670fd..ed9e617 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -388,11 +388,13 @@ private: #define DRAGFULL_OPTION_WINDOWMOVE ((sal_uLong)0x0001) #define DRAGFULL_OPTION_WINDOWSIZE ((sal_uLong)0x0002) -#define DRAGFULL_OPTION_OBJECTMOVE ((sal_uLong)0x0004) -#define DRAGFULL_OPTION_OBJECTSIZE ((sal_uLong)0x0008) #define DRAGFULL_OPTION_DOCKING ((sal_uLong)0x0010) #define DRAGFULL_OPTION_SPLIT ((sal_uLong)0x0020) #define DRAGFULL_OPTION_SCROLL ((sal_uLong)0x0040) +#define DRAGFULL_OPTION_ALL \ +( DRAGFULL_OPTION_WINDOWMOVE | DRAGFULL_OPTION_WINDOWSIZE \ +| DRAGFULL_OPTION_DOCKING | DRAGFULL_OPTION_SPLIT \ +| DRAGFULL_OPTION_SCROLL ) #define LOGO_DISPLAYTIME_STARTTIME ((sal_uLong)0x) diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 8f2d0c1..fe1456b 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -221,10 +221,7 @@ ImplStyleData::ImplStyleData() : mnScreenZoom= 100; mnScreenFontZoom= 100; mnLogoDisplayTime = LOGO_DISPLAYTIME_STARTTIME; -mnDragFullOptions = DRAGFULL_OPTION_WINDOWMOVE | DRAGFULL_OPTION_WINDOWSIZE | - DRAGFULL_OPTION_OBJECTMOVE | DRAGFULL_OPTION_OBJECTSIZE | - DRAGFULL_OPTION_DOCKING| DRAGFULL_OPTION_SPLIT | - DRAGFULL_OPTION_SCROLL; +mnDragFullOptions = DRAGFULL_OPTION_ALL; mnAnimationOptions = 0; mnSelectionOptions = 0; mnDisplayOptions= 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #35 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=4bdf9a02478459a2d2bab749ff0435e8392759d7 fdo#63154 Removed unused solar.h reference The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: accessibility/inc include/toolkit include/unotools toolkit/source unotools/source
accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx |3
include/toolkit/helper/servicenames.hxx|1
include/unotools/charclass.hxx |1
include/unotools/defaultoptions.hxx|3
include/unotools/lingucfg.hxx | 10 -
include/unotools/misccfg.hxx |1
include/unotools/searchopt.hxx |1
include/unotools/transliterationwrapper.hxx|4
toolkit/source/helper/servicenames.cxx |2
unotools/source/config/searchopt.cxx | 71
--
unotools/source/config/useroptions.cxx | 41
-
11 files changed, 3 insertions(+), 135 deletions(-)
New commits:
commit 4bdf9a02478459a2d2bab749ff0435e8392759d7
Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com
Date: Thu Jan 23 02:08:39 2014 -0200
fdo#63154 Removed unused solar.h reference
Change-Id: I6b2f9e04e2232570c8bb9f36252b23a70c5f7525
Reviewed-on: https://gerrit.libreoffice.org/7604
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git
a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 436c8b9..6908edc 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -30,9 +30,6 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include cppuhelper/implbase4.hxx
#include comphelper/accessibletexthelper.hxx
-#include tools/solar.h
-
-// class VCLXAccessibleToolBoxItem
-
class ToolBox;
diff --git a/include/toolkit/helper/servicenames.hxx
b/include/toolkit/helper/servicenames.hxx
index 0f2b9e3..b007a87 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
#include sal/types.h
-#include tools/solar.h
extern const sal_Char szServiceName_Toolkit[], szServiceName2_Toolkit[];
extern const sal_Char szServiceName_MVCIntrospection[],
szServiceName2_MVCIntrospection[];
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index e0de7e1..e5ff179 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -24,7 +24,6 @@
#include boost/noncopyable.hpp
#include i18nlangtag/languagetag.hxx
-#include tools/solar.h
#include com/sun/star/i18n/KCharacterType.hpp
#include com/sun/star/i18n/KParseTokens.hpp
#include com/sun/star/i18n/KParseType.hpp
diff --git a/include/unotools/defaultoptions.hxx
b/include/unotools/defaultoptions.hxx
index 54969d5..fd1bf29 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -21,13 +21,10 @@
#include unotools/unotoolsdllapi.h
#include rtl/ustring.hxx
-#include tools/solar.h
#include unotools/options.hxx
class SvtDefaultOptions_Impl;
-// class SvtDefaultOptions ---
-
class SvtDefaultOptions_Impl;
class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDefaultOptions : public
utl::detail::Options
{
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index c6520ad..eb9c99d 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -26,19 +26,15 @@
#include com/sun/star/uno/Any.h
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/util/XChangesBatch.hpp
-#include tools/solar.h
#include rtl/ustring.hxx
#include unotools/configitem.hxx
#include osl/mutex.hxx
#include unotools/options.hxx
#include i18nlangtag/lang.h
-
#include vector
class SvtLinguConfigItem;
-//
-
struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
{
::com::sun::star::uno::Sequence OUString aActiveDics;
@@ -131,8 +127,6 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions
SvtLinguOptions();
};
-//
-
struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
{
// the URL's pointing to the location of the files the dictionary consists
of
@@ -143,8 +137,6 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
com::sun::star::uno::Sequence OUString aLocaleNames;
};
-//
-
class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
{
// returns static object
@@ -221,8 +213,6 @@ public:
boolHasGrammarChecker() const;
};
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/FDO73546.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 25 +-
3 files changed, 23 insertions(+), 10 deletions(-)
New commits:
commit 896714db527f39497aedee8946964e5acd73778c
Author: umeshkadam umesh.ka...@synerzip.com
Date: Fri Jan 17 19:00:29 2014 +0530
fdo#73546 : faulty value of attribute value in wp:anchor tag
Issue :
- The margins for distL distR were getting exported as a negative
value viz ( distL=-635 distR=-635 ).
- While setting the default frame properties the values for distL
distR were getting defaulted to -1, this value was further
considered while exporting for calculations hence the value
-635 used to appear.
Implementation :
- according to Ecma 20.4.3.6 the values of distL distR should
be positive.
- Added a condition to check the negativity of the value while
setting it to default.
- observed that horizontal orientation values were being populated
to distT distB( top bottom margin respectively) and
vertical orientation values were being populated to distL distR
(Left and right margin respectively). The values should have been
vice versa. Corrected the same.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7501
Change-Id: I056e5845b64cd755429297899eeb972f6009efec
diff --git a/sw/qa/extras/ooxmlexport/data/FDO73546.docx
b/sw/qa/extras/ooxmlexport/data/FDO73546.docx
new file mode 100644
index 000..4682971
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO73546.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index cdb228e..c18277c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2582,6 +2582,14 @@
DECLARE_OOXMLEXPORT_TEST(testTableRowDataDisplayedTwice,table-row-data-displaye
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
}
+DECLARE_OOXMLEXPORT_TEST(testFDO73546, FDO73546.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc,
/w:hdr/w:p[1]/w:r[3]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor,
distL,0);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 354b6eb..1d44373 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -786,22 +786,27 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion(
)
rAppendContext.pLastParagraphProperties-GetWrap() :
pStyleProperties-GetWrap());
-sal_Int32 nBottomDist;
-sal_Int32 nTopDist = nBottomDist =
+/** FDO#73546 : distL distR should be unsigned intgers Ecma
20.4.3.6
+Swapped the array elements 11,12 13,14 since 11 12 are
+LEFT RIGHT margins and 13,14 are TOP and BOTTOM margins
respectively.
+*/
+sal_Int32 nRightDist;
+sal_Int32 nLeftDist = nRightDist =
rAppendContext.pLastParagraphProperties-GethSpace() = 0 ?
rAppendContext.pLastParagraphProperties-GethSpace() :
-pStyleProperties-GethSpace();
+pStyleProperties-GethSpace() = 0 ?
pStyleProperties-GethSpace() : 0;
-pFrameProperties[11].Value = nVertOrient ==
text::VertOrientation::TOP ? 0 : nTopDist;
-pFrameProperties[12].Value = nVertOrient ==
text::VertOrientation::BOTTOM ? 0 : nBottomDist;
+pFrameProperties[11].Value = nHoriOrient ==
text::HoriOrientation::LEFT ? 0 : nLeftDist;
+pFrameProperties[12].Value = nHoriOrient ==
text::HoriOrientation::RIGHT ? 0 : nRightDist;
-sal_Int32 nRightDist;
-sal_Int32 nLeftDist = nRightDist =
+sal_Int32 nBottomDist;
+sal_Int32 nTopDist = nBottomDist =
rAppendContext.pLastParagraphProperties-GetvSpace() = 0 ?
rAppendContext.pLastParagraphProperties-GetvSpace() :
-pStyleProperties-GetvSpace() = 0 ?
pStyleProperties-GetvSpace() : 0;
-pFrameProperties[13].Value = nHoriOrient ==
text::HoriOrientation::LEFT ? 0 : nLeftDist;
-pFrameProperties[14].Value = nHoriOrient ==
text::HoriOrientation::RIGHT ? 0 : nRightDist;
+pStyleProperties-GetvSpace() = 0 ?
pStyleProperties-GetvSpace() : 0;
+
+pFrameProperties[13].Value = nVertOrient ==
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/scripts
desktop/scripts/unoinfo.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a37e0ada8cce6e555e7188c10c0cd0ffe27d7468 Author: Herbert Dürr h...@apache.org Date: Thu Jan 23 09:24:39 2014 + #i123475# fix juh.jar path for unoinfo.sh diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index bb10207..1a22a48 100644 --- a/desktop/scripts/unoinfo.sh +++ b/desktop/scripts/unoinfo.sh @@ -40,7 +40,7 @@ java) printf '0%s\0%s\0%s\0%s\0%s' \ $sd_prog/classes/ridl.jar \ $sd_prog/classes/jurt.jar \ -$sd_prog/classes/java/juh.jar \ +$sd_prog/classes/juh.jar \ $sd_prog/classes/unoil.jar $sd_prog ;; *) ___ 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/svapp.hxx | 50 +++---
1 file changed, 3 insertions(+), 47 deletions(-)
New commits:
commit 826502c7496d1fc4aef46f65f6d2dc8966245ad3
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Thu Jan 23 21:04:31 2014 +1100
Remove unnecessary verbiage.
Change-Id: Icf0230577a5458425f22579e8d17f69c53310812
Reviewed-on: https://gerrit.libreoffice.org/7608
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 05d982a..058f6ad 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -292,8 +292,7 @@ public:
/** @} */ // end of changes
-/** @defgroup Initialization
-Initialization functions
+/** @defgroup Initialization Initialization functions
@{
*/
@@ -607,30 +606,16 @@ public:
@{
*/
-/** Overrides system settings with user settings.
+/** Sets user settings in settings object to override system settings
The system settings that can be overridden are:
- window dragging options (on or off, including live scrolling!)
-- style settings (e.g. cehckbox color, border color, 3D colors,
+- style settings (e.g. checkbox color, border color, 3D colors,
button rollover colors, etc.)
- mouse settings
- menu options, including the mouse follows the menu and whether menu
icons are used
- @remark One wonders why this is a virtual function when all the other
-settings options are static functions. What is it about overridding
-an AllSettings object that requires it to have it's own Application
-instance, when LibreOffice only keeps one Application instance around
-at any time?
-
-Another thing about this function is that it is a remarkably awkward
-name that doesn't \em really describe what it does.
-
- @todo Recommend that rSettings be made immutable and
-we return a new AllSettings because as it stands it would be easy to
-believe that this function changes system settings, which it does not
-as this is the job of @SetSettings.
-
@param rSettings Reference to the settings object to change.
@see MergeSystemSettings, SetSettings, GetSettings
@@ -640,21 +625,6 @@ public:
/** Set the settings object to the platform/desktop environment system
settings.
- @todo Incredibly, this gets the default window, then it uses whatever
-the system settings of this window are. This seems entirely
unnecessary.
-Furthermore, to do this trick it then calls on
@ImplUpdateGlobalSettings
-(a function of the @Window class, which in turn calls on a platform
-specific SalFrame UpdateSettings to update the settings object to the
-environment's defaults.
-
-This would be better refactored to a function that gets the
environment's
-defaults without having to get a Window instance.
-
- @todo Recommend that rSettings be made immutable and
-we return a new AllSettings because as it stands it would be easy to
-believe that this function changes system settings, which it does not
-as this is the job of @SetSettings.
-
@param rSettings Reference to the settings object to change.
@see SystemSettingsChanging, SetSettings, GetSettings
@@ -664,11 +634,6 @@ public:
/** Sets the application's settings and notifies all windows of the
change.
- @todo If the application hasn't initialized its settings yet, then
-currently it calls on GetSettings to initialize the settings. Recommend
-moving the initialization to a private function and call on this
-instead.
-
@param rSettings const reference to settings object used to
change the application's settings.
@@ -680,15 +645,6 @@ public:
/** Gets the application's settings. If the application hasn't initialized
it's settings, then it does so (lazy initialization).
- @remark This is a const function. However, it can update the
-application's settings object in pSVData. Be warned!
-
- @todo We need to call on @GetSettings to initialize the application's
-settings! This makes absolutely no sense. See @SetSettings, which does
-exactly this and doesn't care about the return value. Recommend
-moving this initialization code to a private function and call on
-this seperately.
-
@returns AllSettings instance that contains the current settings of the
application.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl
scripts/esc-bug-stats.pl |1 + 1 file changed, 1 insertion(+) New commits: commit d6c86b100149195e3fb8fd27b9b71ab927ea4dd2 Author: Michael Meeks michael.me...@collabora.com Date: Thu Jan 23 10:15:02 2014 + extend blacklist. diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl index f2e48d9..3c7c29e 100755 --- a/scripts/esc-bug-stats.pl +++ b/scripts/esc-bug-stats.pl @@ -35,6 +35,7 @@ my %sadly_non_libreoffice = ( 'lu hua' = 1, 'Kenneth Graunke' = 1, 'Seif Lotfy' = 1, +'Alex Deucher' = 1, ); # use me for testing XML pretty printing etc. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/README.txt
bibisect/README.txt | 167 1 file changed, 167 insertions(+) New commits: commit 2ecbecbe78c150aa873de45c8fad88777ef06a48 Author: Robinson Tryon qu...@runcibility.com Date: Wed Dec 4 05:07:49 2013 -0500 Bibisect: Add README with step-by-step documentation Change-Id: I94b5088c342587787e0417d37825535ccadc21e7 Reviewed-on: https://gerrit.libreoffice.org/6922 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/bibisect/README.txt b/bibisect/README.txt new file mode 100644 index 000..1305f03 --- /dev/null +++ b/bibisect/README.txt @@ -0,0 +1,167 @@ +README.txt + +This directory contains tools relating to the LibreOffice Bibisect +QA Tool, created by Bjoern Michaelsen: +https://wiki.documentfoundation.org/Bibisect + + +USAGE for 'mergeranges' +--- + +The 'mergeranges' tool may be used to merge ranges of bibisect commits +together, regardless of whether they may be found in the same or +different git repositories. + +To use the tool, you'll need a separate file containing the ranges of +commits to merge. Here's an example of a file containing ranges: + + 50612eb408c515e3672952083b805be708d59c4a..remotes/bibisect35/master + d38dc5cb288aeef58175a0d656091940a3f35ee5..remotes/bibisect36/master + b4e60c226e714050f5ab0680669463b98ccd8ea8..remotes/bibisect40/master + +NOTE: These ranges are *inclusive* -- we'll include ALL of these +commits in the new/expanded bibisect repository. + +The script may be called as follows: + + ./mergeranges file containing ranges + + + Step-by-Step Instructions for a New Repo + + + Prep Cleanup + + +(Things that may need to be cleaned up before you run mergeranges) + +Tags that may already exist: +# UPDATE: we now use 'git tag -f', so if a tag already exists we'll +# just blow it away... +# +# $ for i in `git tag -l|grep source-hash`; do git tag -d $i; done +# $ git tag -d oldest last40onmaster last36onmaster last35onmaster + +Branches: +# UPDATE: +# If it's actually a new repo, then it won't have a 'mergeranges' branch. +# + $ git branch -D mergeranges + + Starting + + +Given: + * Two different git bibisect repositories 'Alice' and 'Bob' + * Alice with linear commits [50612eb4..5b4b36d8] + * Bob with linear commits [1f3b10d8..25428b1e] + * The Bob range follows the Alice range + +1) Create a new repo 'Combined' + +2) Edit the 'ranges' file alongside mergeranges to contain: + 50612eb4..5b4b36d8 + 1f3b10d8..25428b1e + + WARNING: Look through the commits carefully (especially the + first/last commits), and see if there are any empty/stub commits + that don't contain a build. If there are, cut those out of your + range -- they'll just be in the way. + +3) cd into Combined (we'll run mergeranges from there) + +4) Add Alice, Bob as remotes + git remote add alice /home/qubit/alice/.git + git remote add bob /home/qubit/bob/.git + git remote update # This step might take a little while + +5) Run the mergeranges script: + ../dev-tools/bibisect/mergeranges ../dev-tools/bibisect/ranges + +6) Cross your fingers! + + Step-by-Step Instructions for Adding to a Repo + -- + + Prep Cleanup + + +(Things that may need to be cleaned up before you run mergeranges) + +Tags: + Tags may already exist, but we want to save many of them, so punt on this. + +Branches: + We want to save the 'mergeranges' branch + + Starting + + +Given: + * Two different git bibisect repositories 'Alice' and 'Bob' + * Alice with commits in a 'mergeranges' branch + * The Bob range follows the Alice range + * Bob with linear commits [24c6e765..f36b371d] + +1) Edit the 'ranges' file alongside mergeranges to contain: + 24c6e765..f36b371d + + WARNING: Look through the commits carefully (especially the + first/last commits), and see if there are any empty/stub commits + that don't contain a build. If there are, cut those out of your + range -- they'll just be in the way. + +2) cd into Alice (we'll run mergeranges from there) + +3) Add Bob as a remote + git remote add bob /home/qubit/bob/.git + git remote update # This step might take a little while + +4) Run the mergeranges script: + ../dev-tools/bibisect/mergeranges ../dev-tools/bibisect/ranges + +6) Cross your fingers! + + Cleanup After Merge + --- + +1) Remove the remotes + git remote rm alice + git remote rm bob + +2) Tag the oldest commit (the script handles the latest commit) + + # NOTE: If you're using an existing 'mergeranges' branch, the + # 'oldest' tag should already be set on the right commit! + # + # Note: The following should theoretically work, but there's an + # extra 'root' commit in the source repos (perhaps I could remove them?) + #git tag oldest `git rev-list
[Libreoffice-commits] buildbot.git: bibisect/user
bibisect/user/run-libreoffice.sh | 32 1 file changed, 32 insertions(+) New commits: commit b3eb8d390908aacdbe9c90c51ee67f863d1ad4ad Author: Robinson Tryon qu...@runcibility.com Date: Wed Dec 11 16:47:24 2013 -0500 Bibisect: Add wrapper script for running LibreOffice This script uses a bibisect-only dir in /tmp to avoid scribbling over a user's regular profile. Change-Id: I3b106d41bfbe1db6347ed13724ab2340f1514634 Reviewed-on: https://gerrit.libreoffice.org/7040 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/bibisect/user/run-libreoffice.sh b/bibisect/user/run-libreoffice.sh new file mode 100644 index 000..8e56bee --- /dev/null +++ b/bibisect/user/run-libreoffice.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# +# Helper script to run the LibreOffice executable in a bibisect repo. +# - Robinson Tryon qu...@runcibility.com +# - Miroslaw Zalewski mini...@pczta.onet.pl +# +# This script does a little magic behind the scenes to improve the +# bibisect experience: +# * Uses (and clears) alternate user profile location +# * Keeps tester's regular LO profile safe +# * Produces more consistent, reproducible results +# + +echo --- +echo Welcome to the Wonderful World of Bibisect! +echo --- +echo + +# Choose a profile directory inside /tmp. +export BIBISECT_PROFILE_DIR=/tmp/libreoffice-bibisect + +# Make sure to clear the profile directory (in case we've previously +# used it). +rm -rf $BIBISECT_PROFILE_DIR + +echo Starting LibreOffice +./opt/program/soffice -env:UserInstallation=file://$BIBISECT_PROFILE_DIR + + +echo -- +echo Helper Script Done +echo -- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/mergeranges
bibisect/mergeranges | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 7ac23e18c2cc61a7a20f1232263c6820c6e77922
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 4 04:56:10 2013 -0500
Bibisect: mergeranges: Allow merge into existing branch
This commit adds functionality to the 'mergeranges' script. It give us
the ability to add bibisect commits to an existing branch in a
repository. Previously, we could only start the merge process by
creating a new branch.
Change-Id: I436ac6490de6993ed57135b72c793f46150f7b07
Reviewed-on: https://gerrit.libreoffice.org/6921
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index 5d9b14a..b35e951 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -7,8 +7,22 @@ def justrunit(arglist):
print(subprocess.check_output(arglist).decode('utf-8'))
def init_branch(startpoint):
-justrunit(['git', 'checkout', '-b', 'mergeranges', startpoint])
+global initBranch, branchName
+try:
+justrunit(['git', 'checkout', branchName])
+except CalledProcessError as e:
+# If the branch does not exist, we need to create it.
+justrunit(['git', 'checkout', '-b', branchName, startpoint])
+print(Creating branch + branchName)
+else:
+# If the branch already existed, we want to cherry-pick the
+# 'startpoint' commit.
+cherry_pick_theirs(startpoint)
+
+initBranch = True
+
+# Pull a commit into the git repository.
def cherry_pick_theirs(revision):
try:
justrunit(['git', 'rm', '-rf', '.'])
@@ -26,6 +40,5 @@ for line in open(sys.argv[1]).readlines():
for revision in revisions:
if not initBranch:
init_branch(revision)
-initBranch = True
else:
cherry_pick_theirs(revision)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/mergeranges
bibisect/mergeranges | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 293c386f096258d24cb34aaa38bd84f7ab3eb089
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 4 04:34:34 2013 -0500
Bibisect: Add comments and USAGE information to script
Change-Id: I5b2375aa60191c6067a0857a203b3d78fea5acd4
Reviewed-on: https://gerrit.libreoffice.org/6916
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index b35e951..6b6f84c 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -1,4 +1,9 @@
#!/usr/bin/env python3
+#
+# Bibisect: This tool may be used to merge ranges of bibisect commits.
+#
+# USAGE:
+# For usage information, please see the README.txt file
import sys
import subprocess
@@ -6,6 +11,8 @@ import subprocess
def justrunit(arglist):
print(subprocess.check_output(arglist).decode('utf-8'))
+# Given a commit hash, create (if necessary) and checkout branchName
+# at that hash.
def init_branch(startpoint):
global initBranch, branchName
@@ -25,10 +32,20 @@ def init_branch(startpoint):
# Pull a commit into the git repository.
def cherry_pick_theirs(revision):
try:
+# Remove all files currently checked-in to git.
justrunit(['git', 'rm', '-rf', '.'])
except:
pass
+
+# Check out the files from the given revision.
justrunit(['git', 'checkout', revision, '--', '.'])
+
+# Reuse the log message and the authorship information when
+# creating this commit.
+#
+# NOTE: Any untracked files in the repository (e.g. helper scripts
+# such as 'bibisect.sh' or 'run-libreoffice.sh') will be left in
+# place and not committed to the repository.
justrunit(['git', 'commit', '-C', revision])
tag = subprocess.check_output(['git', 'log', '-1', '--pretty=%s',
'HEAD']).decode('utf-8').rstrip()
justrunit(['git', 'tag', tag])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/mergeranges
bibisect/mergeranges | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 1083bdc0ade3293323bd5eaca43b87873f086328
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 4 04:37:47 2013 -0500
Bibisect: Update the 'latest' tag when the merge is done
Change-Id: I331d88729ac6e7fed9bb651e0d79192f25ff6da4
Reviewed-on: https://gerrit.libreoffice.org/6917
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index 6b6f84c..abe92a5 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -8,6 +8,10 @@
import sys
import subprocess
+# Helper function to run code in a subprocess.
+def subrun(arglist):
+return subprocess.check_output(arglist).decode('utf-8')
+
def justrunit(arglist):
print(subprocess.check_output(arglist).decode('utf-8'))
@@ -59,3 +63,10 @@ for line in open(sys.argv[1]).readlines():
init_branch(revision)
else:
cherry_pick_theirs(revision)
+
+# Tag the latest commit.
+justrunit(['git', 'tag', '-f', 'latest',
+ subrun(['git', 'rev-parse', 'HEAD']).rstrip()])
+
+print()
+print(Mergeranges: script done.)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] buildbot.git: .git-hooks/commit-msg .git-hooks/post-merge .git-hooks/pre-commit .git-hooks/README
.git-hooks/README |9 ++
.git-hooks/commit-msg | 181 ++
.git-hooks/post-merge | 12 +++
.git-hooks/pre-commit | 139 ++
4 files changed, 341 insertions(+)
New commits:
commit 2cb2b5537394115c30b5b8ed3d551ffa188a065f
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 11 17:50:54 2013 -0500
gerrit: Add git hooks necessary for contributing via gerrit
I copied these over from the dev-tools repository.
Change-Id: I6989fdb732844072dec264bf6360de69c0a587cd
Reviewed-on: https://gerrit.libreoffice.org/7041
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/.git-hooks/README b/.git-hooks/README
new file mode 100644
index 000..c6612bc
--- /dev/null
+++ b/.git-hooks/README
@@ -0,0 +1,9 @@
+Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to
trigger action at certain points.
+
+There are two groups of these hooks: client side and server side.
+The client-side hooks:
+are for client operations such as committing and merging.
+The server-side hooks:
+are for Git server operations such as receiving pushed commits.
+
+See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ]
\ No newline at end of file
diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
new file mode 100755
index 000..e3dfe69
--- /dev/null
+++ b/.git-hooks/commit-msg
@@ -0,0 +1,181 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by git-commit with one argument, the name of the file
+# that has the commit message. The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit. The hook is allowed to edit the commit message file.
+#
+# To enable this hook, make this file executable.
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*\).*$/Signed-off-by: \1/p')
+# grep -qs ^$SOB $1 || echo $SOB $1
+
+# This example catches duplicate Signed-off-by lines.
+
+base_dir=$(dirname $0)
+MSG=$1
+
+abort() {
+cp $1 $1.save
+cat 2 EOF
+Commit aborted, your commit message was saved as '$1.save'.
+
+Reason: $2
+
+EOF
+exit 1
+}
+
+test = $(grep '^Signed-off-by: ' $1 |
+sort | uniq -c | sed -e '/^[ ]*1[]/d') || {
+ abort $1 Duplicate Signed-off-by lines.
+}
+
+# Check that the first line exists, and is not an asterisk
+
+if [ -z `head -n 1 $1 | grep -v '^[[:blank:]]*\*$'` ] ; then
+abort $1 Please provide the general description on the first line.
+fi
+
+# ...and that it is not too long
+
+if [ `head -n 1 $1 | wc -c` -gt 79 ] ; then
+abort $1 The first line is too long, please try to fit into 79
characters.
+fi
+
+# ...and that it does not continue on the second line
+if [ `wc -l $1` -gt 1 -a -n `head -n 2 $1 | tail -n 1 | sed 's/^#.*//'`
] ; then
+abort $1 The second line is not empty - maybe the first line continues
there?
+fi
+
+# Check that the message is not a ChangeLog-like one
+
+if [ -n `head -n 1 $1 | grep '^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*.*@.*'` ]
; then
+abort $1 The commit message looks like ChangeLog, please use the git
form.
+fi
+
+# Check for whitespace in front of *'s
+
+if [ -n `sed '/^#/,$d' $1 | grep '^[[:space:]]\+\*.*:'` -a -z `grep '^\*'
$1` ] ; then
+abort $1 Please don't use whitespace in front of '* file: Description.'
entries.
+fi
+
+# Check that lines do not start with '#something' (possibly accidental
commit,
+# such as starting the message with '#ifdef', git commits start with
'#whitespace'.
+
+if [ -n `grep '^#[^[:blank:]]' $1` ] ; then
+abort $1 Possible accidental comment in the commit message (leading #
without space).
+fi
+
+
+#-- copied gerrit commit-msg hook to handle ChangeId --
+# From Gerrit Code Review 2.3
+#
+# Part of Gerrit Code Review (http://code.google.com/p/gerrit/)
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+CHANGE_ID_AFTER=Bug|Issue
+
+# Check for, and add if missing, a unique Change-Id
+#
+add_ChangeId() {
+clean_message=`sed -e '
+/^diff --git a\/.*/{
+s///
+q
+}
+/^Signed-off-by:/d
+/^#/d
+' $MSG | git stripspace`
[Libreoffice-commits] dev-tools.git: bibisect/mergeranges
bibisect/mergeranges | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit ad1143a3b96388c58e7566da9a3c61e5801a3b24
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 4 04:51:46 2013 -0500
Bibisect: Factor-out branchName; move initBranch in prep for refactor
Change-Id: Ia54213873aefdca819504e790aa70acbcf1bf032
Reviewed-on: https://gerrit.libreoffice.org/6919
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index abe92a5..1dcb008 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -13,7 +13,13 @@ def subrun(arglist):
return subprocess.check_output(arglist).decode('utf-8')
def justrunit(arglist):
-print(subprocess.check_output(arglist).decode('utf-8'))
+print(subrun(arglist))
+
+# There is only one initial branch.
+initBranch = False
+
+# The branch on which we should store our merged commits.
+branchName = 'mergeranges'
# Given a commit hash, create (if necessary) and checkout branchName
# at that hash.
@@ -55,7 +61,8 @@ def cherry_pick_theirs(revision):
justrunit(['git', 'tag', tag])
-initBranch = False
+
+# Take input from the 'ranges' file passed-in on the command line.
for line in open(sys.argv[1]).readlines():
revisions = [r for r in subprocess.check_output(['git', 'rev-list',
'--reverse', line.rstrip()]).decode('utf-8').split('\n') if r.rstrip()]
for revision in revisions:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/mergeranges
bibisect/mergeranges |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 55f74ce5a10a4757981d4ee9766be8df01b517e9
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 4 04:42:31 2013 -0500
Bibisect: Tweak passed-in commit range to be inclusive
This commit tweaks the commit ranges passed-in via a 'ranges' file on
the command line. Previously, git-rev-list would include the range as
(oldest, latest], but now we include the range as [oldest, latest].
Change-Id: Iccb449ad4da4d521ecd2148902c991698c9865d7
Reviewed-on: https://gerrit.libreoffice.org/6918
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index 1dcb008..58dff4f 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -64,9 +64,16 @@ def cherry_pick_theirs(revision):
# Take input from the 'ranges' file passed-in on the command line.
for line in open(sys.argv[1]).readlines():
-revisions = [r for r in subprocess.check_output(['git', 'rev-list',
'--reverse', line.rstrip()]).decode('utf-8').split('\n') if r.rstrip()]
+print(line)
+
+# Assemble a list of revisions in the given range.
+argsRevRevList = ['git', 'rev-list', '--reverse',
+ # We have to modify the range to make it inclusive.
+ line.rstrip().replace(.., ^..)]
+revisions = [r for r in subrun(argsRevRevList).split('\n') if r.rstrip()]
for revision in revisions:
if not initBranch:
+print(init_branch: + revision)
init_branch(revision)
else:
cherry_pick_theirs(revision)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: bibisect/mergeranges
bibisect/mergeranges | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit b739129abc410445d9baa32179885009903ad703
Author: Robinson Tryon qu...@runcibility.com
Date: Wed Dec 4 04:53:58 2013 -0500
Bibisect: Clarify tag code; silently overwrite tags if they exist
Change-Id: I60d4f53a36add7db39c097d7d7311d0351cb1b54
Reviewed-on: https://gerrit.libreoffice.org/6920
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index 58dff4f..d7416c2 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -57,10 +57,15 @@ def cherry_pick_theirs(revision):
# such as 'bibisect.sh' or 'run-libreoffice.sh') will be left in
# place and not committed to the repository.
justrunit(['git', 'commit', '-C', revision])
-tag = subprocess.check_output(['git', 'log', '-1', '--pretty=%s',
'HEAD']).decode('utf-8').rstrip()
-justrunit(['git', 'tag', tag])
-
+# Create a tag using the first line of the commit message we just
+# picked.
+argsHeadTag = ['git', 'log', '-1', '--pretty=%s', 'HEAD']
+tag = subrun(argsHeadTag).rstrip()
+
+# Tag our cherry-picked commit. If the tag already exists, replace
+# it (quietly).
+justrunit(['git', 'tag', '-f', tag])
# Take input from the 'ranges' file passed-in on the command line.
for line in open(sys.argv[1]).readlines():
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 42788] FORMATTING - Numbering/ordered list results in misaligned text after a certain level: default indent does not match with the width of numbers/bullets
https://bugs.freedesktop.org/show_bug.cgi?id=42788 --- Comment #16 from Valerio valeriod...@yahoo.it --- Created attachment 92653 -- https://bugs.freedesktop.org/attachment.cgi?id=92653action=edit This is how MS works about roman numbering list -- 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 - cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source
cui/UIConfig_cui.mk|2
cui/source/customize/eventdlg.cxx | 20 --
cui/source/customize/eventdlg.hxx |2
cui/source/customize/macropg.cxx | 220 +++
cui/source/customize/macropg.src | 69 ---
cui/source/customize/macropg_impl.hxx | 15 -
cui/source/inc/headertablistbox.hxx|4
cui/source/inc/macropg.hxx | 26 --
cui/uiconfig/ui/macroassigndialog.ui | 82
cui/uiconfig/ui/macroassignpage.ui | 231 +
extras/source/glade/libreoffice-catalog.xml.in |3
11 files changed, 410 insertions(+), 264 deletions(-)
New commits:
commit 121b8691b31b3eae459844d377b6d7d80ded83b6
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 11:10:08 2014 +
adjust macro assign dialog to have horizontal buttons
Change-Id: I9acb9a85f7172e492818fecea73f64a2a1071a4b
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index db4c9ba..87ed9afe 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
cui/uiconfig/ui/linestyletabpage \
+ cui/uiconfig/ui/macroassigndialog \
cui/uiconfig/ui/macroassignpage \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 734c598..3542706 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -930,7 +930,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl,
Button *, pButton )
SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent,
const SfxItemSet rSet)
-: SfxSingleTabDialog(pParent, rSet)
+: SfxSingleTabDialog(pParent, rSet, MacroAssignDialog,
cui/ui/macroassigndialog.ui)
{
GetOKButton()-SetClickHdl( LINK( this, SvxMacroAssignSingleTabDialog,
OKHdl_Impl ) );
}
diff --git a/cui/uiconfig/ui/macroassigndialog.ui
b/cui/uiconfig/ui/macroassigndialog.ui
new file mode 100644
index 000..3b16131
--- /dev/null
+++ b/cui/uiconfig/ui/macroassigndialog.ui
@@ -0,0 +1,82 @@
+?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.0 on Thu Jan 23 11:08:16 2014 --
+interface
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkDialog id=MacroAssignDialog
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesAssign action/property
+property name=type_hintdialog/property
+child internal-child=vbox
+ object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing12/property
+child internal-child=action_area
+ object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+ object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+ /packing
+/child
+child
+ object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_stockTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+ /packing
+/child
+
[Bug 42788] FORMATTING - Numbering/ordered list results in misaligned text after a certain level: default indent does not match with the width of numbers/bullets
https://bugs.freedesktop.org/show_bug.cgi?id=42788 --- Comment #17 from Valerio valeriod...@yahoo.it --- Hi all, I'm looking at this bug as my first easy hack. I start to check how MS Office work about the same problem, and I found that MS use a different approach, as showed in the attached pictures. I guess the real problem here is how to manage the space taken for the roman number when it start to increase for very long list. We need to be able to manage a long list case where the first line have only one singol character as bullet char, whereas the last line can have 8 char (i.e. LXXXVIII). How MS works: it uses the space between the bullet char and the text as a referement point, then the bullet char string is aligned to the right and the text is aligned to the left (see attached picture). In that way, however, the char string can go out of the page margin. How LO works: looks like all element are aligned to the first char of the bullet string. In that way the bullet string are aligned through the list but the rest are not. Actualy the space between the separator char and the user's text change depending to the bullet string lengh, producing a bad look. Proposal: Use a fixed offset applied after the separator char, ignoring the identation aligment of the user's text respect to the previuos and the subsequent bullet point. The space taken by the bullet string can increae but the space between the separator char and the user's text will be always the same and big enough to make the text beautiful. NOTE: this would be my first hack in LO and my first try with C++ language, so I hesitate a bit to assign it to me, maybe there is someone more capable than me that could work on this one. -- 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: Branch 'refs/notes/commits' - b5/797deea72476fbcec4315f1f18249fd39bbaea
b5/797deea72476fbcec4315f1f18249fd39bbaea |1 + 1 file changed, 1 insertion(+) New commits: commit d3a5279e764a932f4bc19b02f04457426a0301b7 Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 11:30:37 2014 + Notes added by 'git notes add' diff --git a/b5/797deea72476fbcec4315f1f18249fd39bbaea b/b5/797deea72476fbcec4315f1f18249fd39bbaea new file mode 100644 index 000..f509f1e --- /dev/null +++ b/b5/797deea72476fbcec4315f1f18249fd39bbaea @@ -0,0 +1 @@ +merged as: 62c2022ba73b165072e0bf01f7f368f0ecda9aad ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/01/06140500.xhp | 12 ++-- 2 files changed, 6 insertions(+), 12 deletions(-) New commits: commit ffb2ed136796922df0b2aa60787ddd2ace3e71ec Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 11:29:22 2014 + update help ids for macro assign dialog .ui conversion Change-Id: Ia469726a4e664f3e87d70933eeda86dabd848cf1 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 4c24754..13a84c3 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2324,7 +2324,6 @@ HID_LTRWIZ_TXTSENDERSTATE_TEXT,40805, HID_LTRWIZ_TXTSENDERSTREET,40803, HID_LTRWIZ_TXTTEMPLATENAME,40812, HID_MACRO_GROUP,40082, -HID_MACRO_HEADERTABLISTBOX,40085, HID_MACRO_LB_EVENT,40081, HID_MACRO_MACROS,40083, HID_MACRO_MIGRATION_BACKUP_LOCATION,39152, @@ -3513,7 +3512,6 @@ HID_SVX_CONFIG_RENAME_TOOLBAR,40048, HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM,40049, HID_SVX_CONFIG_TOOLBAR,40009, HID_SVX_CONFIG_TOOLBAR_CONTENTS,40010, -HID_SVX_MACRO_LB_EVENT,4, HID_SVX_MDLG_DOCRECOVERY_BROKEN,40033, HID_SVX_MDLG_DOCRECOVERY_PROGR,40031, HID_SVX_MDLG_ERR_REP_OPTIONS,40036, @@ -6683,9 +6681,6 @@ svx_PushButton_RID_SVXPAGE_KEYBOARD_BTN_SAVE,705516073, svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_ADD,701567489, svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_DELETE,701567491, svx_PushButton_RID_SVXPAGE_LINE_DEF_BTN_MODIFY,701567490, -svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_ASSIGN,705565186, -svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_ASSIGN_COMPONENT,705565191, -svx_PushButton_RID_SVXPAGE_MACROASSIGN_PB_DELETE,705565187, svx_PushButton_RID_SVXPAGE_MENUS_BTN_ADD_COMMANDS,705499974, svx_PushButton_RID_SVXPAGE_MENUS_BTN_NEW,705499960, svx_PushButton_RID_SVXPAGE_OPTIONS_JAVA_PB_ADD,704860692, @@ -6750,7 +6745,6 @@ svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION,1237598721, svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680, svx_TabPage_RID_SVXPAGE_EVENTASSIGN,705675264, svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880, -svx_TabPage_RID_SVXPAGE_MACROASSIGN,705560576, svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320, svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592, svx_TriStateBox_RID_SVXPAGE_LINE_TSB_CENTER_END,701548037, diff --git a/source/text/shared/01/06140500.xhp b/source/text/shared/01/06140500.xhp index 13ac942..30d51c6 100644 --- a/source/text/shared/01/06140500.xhp +++ b/source/text/shared/01/06140500.xhp @@ -33,8 +33,8 @@ bookmark xml-lang=en-US branch=index id=bm_id3152427bookmark_valuecustomizing; events/bookmark_value bookmark_valueevents; customizing/bookmark_value /bookmark -!-- removed HID HID_CONFIG_EVENT -- bookmark xml-lang=en-US branch=hid/.uno:TableEvents id=bm_id1163922275 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/macroassignpage/MacroAssignPage id=bm_id1163922276 localize=false/ paragraph role=heading id=hd_id3152427 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/06140500.xhp name=EventsEvents/link/paragraph paragraph role=paragraph id=par_id3152937 xml-lang=en-US l10n=CHG oldref=2variable id=assignactionahelp hid=.Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs./ahelp/variable/paragraph /section @@ -52,16 +52,16 @@ bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN id=bm_id1163975 localize=false/paragraph role=heading id=par_idN1060A xml-lang=en-US level=2 l10n=NEWSave In/paragraph paragraph role=paragraph id=par_idN1060E xml-lang=en-US l10n=NEWahelp hid=705547787Select first where to save the event binding, in the current document or in %PRODUCTNAME./ahelp/paragraph paragraph role=note id=par_id3153662 xml-lang=en-US l10n=U oldref=36A macro that is saved with a document can only be run when that document is opened./paragraph -bookmark xml-lang=en-US branch=hid/CUI_HID_SVX_MACRO_LB_EVENT id=bm_id1800286 localize=false/paragraph role=paragraph id=par_idN1061A xml-lang=en-US l10n=NEWahelp hid=4The big list box lists the events and the assigned macros. After you selected the location in the emphSave In/emph list box, select an event in the big list box. Then click emphAssign Macro/emph./ahelp/paragraph -!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN -- +bookmark xml-lang=en-US branch=hid/CUI_HID_SVX_MACRO_LB_EVENT id=bm_id1800286 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/macroassignpage/assignments id=bm_id1800286 localize=false/ +paragraph role=paragraph id=par_idN1061A xml-lang=en-US l10n=NEWahelp hid=4The big list box lists the events and the assigned macros. After you selected the location in the emphSave In/emph list box, select an event in the big list box. Then click emphAssign Macro/emph./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN id=bm_id755672891 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/macroassignpage/assign
[Libreoffice-commits] core.git: 2 commits - helpcontent2 vcl/source
helpcontent2|2 +-
vcl/source/gdi/impgraph.cxx | 15 +++
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 62c2022ba73b165072e0bf01f7f368f0ecda9aad
Author: Armin Le Grand a...@apache.org
Date: Wed Jan 22 20:25:16 2014 +
Resolves: #i123983# Corrected Graphic Metafile fallback creator
(cherry picked from commit b5797deea72476fbcec4315f1f18249fd39bbaea)
Change-Id: I4d09592cd9e4b86445d048fb875e7bc13b03801d
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 4b87d6f..5fe1572 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -630,22 +630,21 @@ const GDIMetaFile ImpGraphic::ImplGetGDIMetaFile() const
pThat-maEx = maSvgData-getReplacement();
}
-VirtualDevice aVirDev;
-const Size aSizePixel(maEx.GetSizePixel());
-
-pThat-maMetaFile.Record(aVirDev);
-
+// #123983# directly create a metafile with the same PrefSize and
PrefMapMode
+// the bitmap has, this will be an always correct metafile
if(maEx.IsTransparent())
{
-aVirDev.DrawBitmapEx(Point(), maEx);
+pThat-maMetaFile.AddAction(new MetaBmpExScaleAction(Point(),
maEx.GetPrefSize(), maEx));
}
else
{
-aVirDev.DrawBitmap(Point(), maEx.GetBitmap());
+pThat-maMetaFile.AddAction(new MetaBmpScaleAction(Point(),
maEx.GetPrefSize(), maEx.GetBitmap()));
}
pThat-maMetaFile.Stop();
-pThat-maMetaFile.SetPrefSize(aSizePixel);
+pThat-maMetaFile.WindStart();
+pThat-maMetaFile.SetPrefSize(maEx.GetPrefSize());
+pThat-maMetaFile.SetPrefMapMode(maEx.GetPrefMapMode());
}
return maMetaFile;
commit 235723e5eb2983361ec81d6898947cc8bccab224
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 11:29:22 2014 +
Updated core
Project: help ffb2ed136796922df0b2aa60787ddd2ace3e71ec
diff --git a/helpcontent2 b/helpcontent2
index 23bdde9..ffb2ed1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 23bdde918a84d61f7162980ee9356363c3393202
+Subproject commit ffb2ed136796922df0b2aa60787ddd2ace3e71ec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a3/7e0ada8cce6e555e7188c10c0cd0ffe27d7468
a3/7e0ada8cce6e555e7188c10c0cd0ffe27d7468 |1 + 1 file changed, 1 insertion(+) New commits: commit 1cd892e512ed80f6ac057e36a4fa04950ce5831e Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 11:32:41 2014 + Notes added by 'git notes add' diff --git a/a3/7e0ada8cce6e555e7188c10c0cd0ffe27d7468 b/a3/7e0ada8cce6e555e7188c10c0cd0ffe27d7468 new file mode 100644 index 000..da35a16 --- /dev/null +++ b/a3/7e0ada8cce6e555e7188c10c0cd0ffe27d7468 @@ -0,0 +1 @@ +prefer: b786a33cfdca2e8a4114ddef0340e0e0628dd09c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - smoketest/Module_smoketest.mk solenv/bin solenv/gbuild
smoketest/Module_smoketest.mk |4 solenv/bin/unittest-failed.sh | 23 +++ solenv/gbuild/CppunitTest.mk |9 + solenv/gbuild/PythonTest.mk |4 ++-- 4 files changed, 30 insertions(+), 10 deletions(-) New commits: commit 1c3f994c515e4f227e0b052d18899a897c042013 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Jan 23 12:54:30 2014 +0100 smoketest cant work without extensions Change-Id: I58af85205cce89c2eff3db24a477171ce39d47dc diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 798b787..7195fda 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -18,11 +18,13 @@ $(eval $(call gb_Module_add_targets,smoketest,\ )) ifneq ($(ENABLE_JAVA),) +ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,smoketest,\ Extension_TestExtension \ Jar_TestExtension \ )) endif +endif ifeq ($(OS),LINUX) $(eval $(call gb_Module_add_check_targets,smoketest,\ @@ -31,10 +33,12 @@ $(eval $(call gb_Module_add_check_targets,smoketest,\ endif ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX)) +ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\ CppunitTest_smoketest \ )) endif +endif endif commit b5e988ffc121147c052cf9d6992afc35db3df49b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Jan 23 12:51:38 2014 +0100 make unittest failure foo a script - first of all, code from CppunitTest.mk used from PythonTest.mk is bad anyway - also, this shortens and removes noise from the commandline executed Change-Id: I6c5b41a0c497b766c3293aeec5c59240aa3ef37c diff --git a/solenv/bin/unittest-failed.sh b/solenv/bin/unittest-failed.sh new file mode 100755 index 000..35db6dc --- /dev/null +++ b/solenv/bin/unittest-failed.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# -*- Mode: sh; tab-width: 4; indent-tabs-mode: t -*- +# +# 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 . + +printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TRUE# for exception catching\nexport CPPUNITTRACE=gdb --args # for interactive debugging on linux\nexport CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio\nexport VALGRIND=memcheck# for memory checking\n\nand retry using: make %sTest_%s\n\n' $1 $2 +exit 1 + +# vim: set et sw=4: diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index b2c268d..ba3ddac 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -17,15 +17,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # - # CppunitTest class -# $(1): Cppunit or Python -# $(2): the name of the unit test that failed -define gb_UNIT_FAILED_MSG -printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TRUE# for exception catching\nexport CPPUNITTRACE=gdb --args # for interactive debugging on linux\nexport CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio\nexport VALGRIND=memcheck# for memory checking\n\nand retry using: make %sTest_%s\n\n' $(1) $(2) -endef - ifeq ($(strip $(DEBUGCPPUNIT)),TRUE) gb_CppunitTest_GDBTRACE := gdb -nx -ex add-auto-load-safe-path $(INSTDIR) --command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result --args else ifneq ($(strip $(CPPUNITTRACE)),) @@ -96,7 +89,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) || ($(if $(value gb_CppunitTest_postprocess), \ RET=$$?; \ $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) $@.log 21;) \ - cat $@.log; $(call gb_UNIT_FAILED_MSG,Cppunit,$*); false + cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Cppunit $* define gb_CppunitTest_CppunitTest $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1))) diff --git
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/miscdlgs/inscodlg.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 6abcfea44da2811940578f248080951eb320420f Author: Tsutomu Uchino ha...@apache.org Date: Thu Jan 23 11:28:01 2014 + #i123626# change default for paste special dialog of Calc to Text, Numbers and Date and time diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index d28aac3..32c33d0 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -37,10 +37,8 @@ //== -sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_True; -sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | - IDF_NOTE | IDF_FORMULA | - IDF_ATTRIB | IDF_OBJECTS); +sal_Bool ScInsertContentsDlg::bPreviousAllCheck = sal_False; +sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING); sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 David Tardon dtar...@redhat.com changed: What|Removed |Added CC||dtar...@redhat.com --- Comment #11 from David Tardon dtar...@redhat.com --- (In reply to comment #2) Created attachment 88144 [details] [review] proposed patch Here is a patch that updates desktop files. Proposed changes are: - reactivate StartCenter Why? What good does it do to the user, when there are already separate records for the applications? and Math desktop file: NoDisplay keyword set to false This is a regression from bug 41681. IIRC the consensus of most distro maintainers was not to show it. (And yes, there is no way to please users anyway. We have got bugs in Fedora asking for both.) -- 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: sd/source
sd/source/ui/view/Outliner.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f313d63bc538f85e77323ea1847c67d6e5a6a34e Author: Tor Lillqvist t...@collabora.com Date: Thu Jan 23 14:17:42 2014 +0200 WaE: Fix bool sillyness Change-Id: I4aeb9204a6a5ab79954b3a8ccadf58362f0f43d2 diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index d68bb78..fd95253 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1438,7 +1438,7 @@ bool Outliner::HasNoPreviousMatch (void) // Detect whether the cursor stands at the beginning // resp. at the end of the text. -return pOutlinerView-GetSelection().IsEqual(GetSearchStartPosition ()) == sal_True; +return pOutlinerView-GetSelection().IsEqual(GetSearchStartPosition ()); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/menus/math.desktop|2 +- sysui/desktop/menus/startcenter.desktop |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 12546c8511f0cc8eec0ca7e8cb86ff00dfd429e6 Author: David Tardon dtar...@redhat.com Date: Thu Jan 23 13:38:33 2014 +0100 regression since fdo#70553 Since there was no explanation why this change had been made, I have reverted it. Change-Id: I3bf3428d960bf99d4c242d187bf1e2bf62e71aaa diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 57b1734..a6c150b 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -18,7 +18,7 @@ [Desktop Entry] Version=1.0 Terminal=false -NoDisplay=false +NoDisplay=true Icon=math Type=Application Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index dabe887..2c7ab56 100755 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -18,7 +18,7 @@ [Desktop Entry] Version=1.0 Terminal=false -NoDisplay=false +NoDisplay=true Icon=startcenter Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/font.hxx|4 ++--
vcl/source/gdi/font.cxx | 10 ++
2 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 7abe546e8105dff10536b7496ec46f911d6b9882
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 23 13:40:30 2014 +0100
bool improvements
Change-Id: I3a3a2122902e1731e95d8469dfe9efc5a6b567ee
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index b597c11..8a2fb76 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -126,8 +126,8 @@ public:
voidGetFontAttributes( ImplFontAttributes rAttrs ) const;
Font operator=( const Font );
-sal_Booloperator==( const Font ) const;
-sal_Booloperator!=( const Font rFont ) const
+booloperator==( const Font ) const;
+booloperator!=( const Font rFont ) const
{ return !(Font::operator==( rFont )); }
sal_BoolIsSameInstance( const Font ) const;
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 70febab..2da4418 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -587,15 +587,9 @@ Font Font::operator=( const Font rFont )
return *this;
}
-sal_Bool Font::operator==( const Font rFont ) const
+bool Font::operator==( const Font rFont ) const
{
-
-if( mpImplFont == rFont.mpImplFont )
-return sal_True;
-if( *mpImplFont == *rFont.mpImplFont )
-return sal_True;
-
-return sal_False;
+return mpImplFont == rFont.mpImplFont || *mpImplFont == *rFont.mpImplFont;
}
void Font::Merge( const Font rFont )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillScript target:4.2.0|SkillScript target:4.2.0 ||target:4.3.0 --- Comment #12 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- David Tardon committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=12546c8511f0cc8eec0ca7e8cb86ff00dfd429e6 regression since fdo#70553 The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 - ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
68 ++
1 file changed, 68 insertions(+)
New commits:
commit 55d2f55ddfb50f8e94d8d2fd29e98de5e861
Author: Tor Lillqvist t...@collabora.com
Date: Thu Jan 23 07:17:29 2014 +0200
Add objface.cxx
Change-Id: I2444acf09b3108c1a79658f0954bb9481c8fad0c
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index e2365ef..4ec246a 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -165,6 +165,7 @@
BE35B5A1188FFA88001B7439 /* typeprovider.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
typeprovider.cxx; path = ../../../cppuhelper/source/typeprovider.cxx;
sourceTree = group; };
BE35B5A2188FFA88001B7439 /* unourl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = unourl.cxx;
path = ../../../cppuhelper/source/unourl.cxx; sourceTree = group; };
BE35B5A3188FFA88001B7439 /* weak.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = weak.cxx; path
= ../../../cppuhelper/source/weak.cxx; sourceTree = group; };
+ BE35B5A71890520E001B7439 /* objface.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = objface.cxx;
path = ../../../sfx2/source/control/objface.cxx; sourceTree = group; };
BE82BD7218218E2E00A447B5 /* TiledLibreOffice.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = TiledLibreOffice.app; sourceTree = BUILT_PRODUCTS_DIR; };
BE82BD7518218E2E00A447B5 /* Foundation.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
BE82BD7718218E2E00A447B5 /* CoreGraphics.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreGraphics.framework; path =
System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -430,10 +431,19 @@
name = cppuhelper;
sourceTree = group;
};
+ BE35B5A6189051F7001B7439 /* sfx2 */ = {
+ isa = PBXGroup;
+ children = (
+ BE35B5A71890520E001B7439 /* objface.cxx */,
+ );
+ name = sfx2;
+ sourceTree = group;
+ };
BE82BD6918218E2E00A447B5 = {
isa = PBXGroup;
children = (
BE0898E61860D3CD0021A679 /* LibreOffice source
files */,
+ BE35B5A6189051F7001B7439 /* sfx2 */,
BE82BD7B18218E2E00A447B5 /* TiledLibreOffice */,
BEEEF9681860A21F00FBDE67 /* Resources */,
BE82BD7418218E2E00A447B5 /* Frameworks */,
commit 8b9536f61ad08ff9b56b9aae790495bd14b4f81a
Author: Tor Lillqvist t...@collabora.com
Date: Wed Jan 22 15:23:53 2014 +0200
Add cppuhelper sources
Change-Id: I47545d0592348f585c23e3c6be079e0ed664d706
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 8f44c02..e2365ef 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -140,6 +140,31 @@
BE35B5871886C50A001B7439 /* textlayout.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
textlayout.cxx; path = ../../../vcl/source/gdi/textlayout.cxx; sourceTree =
group; };
BE35B5881886C50A001B7439 /* virdev.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = virdev.cxx;
path = ../../../vcl/source/gdi/virdev.cxx; sourceTree = group; };
BE35B5891886C50A001B7439 /* wall.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = wall.cxx; path
= ../../../vcl/source/gdi/wall.cxx; sourceTree = group; };
+ BE35B58B188FFA88001B7439 /* access_control.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
access_control.cxx; path = ../../../cppuhelper/source/access_control.cxx;
sourceTree = group; };
+ BE35B58C188FFA88001B7439 /* bootstrap.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bootstrap.cxx;
path =
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added CC||momonas...@gmail.com --- Comment #13 from Maxim Monastirsky momonas...@gmail.com --- (In reply to comment #11) (In reply to comment #2) Proposed changes are: - reactivate StartCenter Why? What good does it do to the user, when there are already separate records for the applications? Hi David, What the point of having a Start center if no one will ever see it when he starts the application? -- 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 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #14 from David Tardon dtar...@redhat.com --- (In reply to comment #13) (In reply to comment #11) (In reply to comment #2) Proposed changes are: - reactivate StartCenter Why? What good does it do to the user, when there are already separate records for the applications? Hi David, What the point of having a Start center if no one will ever see it when he starts the application? I doubt anyone just wants to start the application. One wants to create a document or presentation or... -- 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 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #15 from Maxim Monastirsky momonas...@gmail.com --- (In reply to comment #14) I doubt anyone just wants to start the application. One wants to create a document or presentation or... Or to open recently edited document. The new start center allows to do that in a convenient way, instead of opening the file browser and navigating through endless folders... -- 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: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30a561c0082d98c195caaa255c50fb6f0f679cc1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 13:04:41 2014 + Updated core Project: help 62b18032fcaa27d61f2228a02750f49d62891cf1 diff --git a/helpcontent2 b/helpcontent2 index ffb2ed1..62b1803 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ffb2ed136796922df0b2aa60787ddd2ace3e71ec +Subproject commit 62b18032fcaa27d61f2228a02750f49d62891cf1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 08/d42c4da0a3f6dc105080102c1b1de4bce987a1
08/d42c4da0a3f6dc105080102c1b1de4bce987a1 |1 + 1 file changed, 1 insertion(+) New commits: commit d197da7ca751c1a01b9979b0b1bc2947d8a03da1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 14:12:30 2014 + Notes added by 'git notes add' diff --git a/08/d42c4da0a3f6dc105080102c1b1de4bce987a1 b/08/d42c4da0a3f6dc105080102c1b1de4bce987a1 new file mode 100644 index 000..e71ef41 --- /dev/null +++ b/08/d42c4da0a3f6dc105080102c1b1de4bce987a1 @@ -0,0 +1 @@ +merged as: fb0cce507f9c83485da56847529d2fae4d53d9a3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/sbasic/shared/05060700.xhp |6 +++--- source/text/swriter/01/05060700.xhp| 17 ++--- 3 files changed, 9 insertions(+), 21 deletions(-) New commits: commit 62b18032fcaa27d61f2228a02750f49d62891cf1 Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 13:04:41 2014 + update help ids for event assign .ui conversion Change-Id: I4457daf43c968cf103cd3b07b3b7bf885d3b7a43 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 13a84c3..855383c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2323,9 +2323,6 @@ HID_LTRWIZ_TXTSENDERPOSTCODE,40804, HID_LTRWIZ_TXTSENDERSTATE_TEXT,40805, HID_LTRWIZ_TXTSENDERSTREET,40803, HID_LTRWIZ_TXTTEMPLATENAME,40812, -HID_MACRO_GROUP,40082, -HID_MACRO_LB_EVENT,40081, -HID_MACRO_MACROS,40083, HID_MACRO_MIGRATION_BACKUP_LOCATION,39152, HID_MD_COPY_TO_CLIPBOARD,53441, HID_MD_GLOS_DEFINE,53424, @@ -6489,7 +6486,6 @@ svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452, svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537, svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538, svx_ListBox_RID_SVXPAGE_DOCRECOVERY_SAVE_LB_SAVE_FILELIST,700845574, -svx_ListBox_RID_SVXPAGE_EVENTASSIGN_LB_SCRIPTTYPE,705678856, svx_ListBox_RID_SVXPAGE_EVENTS_LB_SAVEIN,705547787, svx_ListBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_LB_FORM,704482850, svx_ListBox_RID_SVXPAGE_HYPERLINK_INTERNET_LB_FORM,704450082, @@ -6663,8 +6659,6 @@ svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_ERRSEND_OPT,700895769, svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_ERRSEND_SHOWREP,700895768, svx_PushButton_RID_SVXPAGE_ERR_REP_SEND_BTN_RECOV_PREV,700895754, svx_PushButton_RID_SVXPAGE_ERR_REP_WELCOME_BTN_RECOV_PREV,700879370, -svx_PushButton_RID_SVXPAGE_EVENTASSIGN_PB_ASSIGN,705679875, -svx_PushButton_RID_SVXPAGE_EVENTASSIGN_PB_DELETE,705679876, svx_PushButton_RID_SVXPAGE_EVENTS_PB_ASSIGN,705548802, svx_PushButton_RID_SVXPAGE_EVENTS_PB_DELETE,705548803, svx_PushButton_RID_SVXPAGE_FOOTER_BTN_EXTRAS,701141544, @@ -6743,7 +6737,6 @@ svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BELOW,1237598727, svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED,1237598722, svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION,1237598721, svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680, -svx_TabPage_RID_SVXPAGE_EVENTASSIGN,705675264, svx_TabPage_RID_SVXPAGE_IMPROVEMENT,705658880, svx_TabPage_RID_SVX_GRFFILTER_DLG_EMBOSS_TAB,706232320, svx_TabPage_RID_SVX_XFORMS_TABPAGES,832110592, diff --git a/source/text/sbasic/shared/05060700.xhp b/source/text/sbasic/shared/05060700.xhp index 51a3513..7f46e0d 100644 --- a/source/text/sbasic/shared/05060700.xhp +++ b/source/text/sbasic/shared/05060700.xhp @@ -38,7 +38,7 @@ paragraph role=paragraph id=par_id3153748 xml-lang=en-US l10n=U oldref=2ahelp hid=.Choose the macro that you want to execute when the selected graphic, frame, or OLE object is selected./ahelp Depending on the object that is selected, the function is either found on the emphMacro/emph tab of the emphObject/emph dialog, or in the emphAssign Macro/emph dialog./paragraph /section paragraph role=heading id=hd_id3150503 xml-lang=en-US level=2 l10n=U oldref=3Event/paragraph -paragraph role=paragraph id=par_id3149763 xml-lang=en-US l10n=U oldref=4ahelp hid=HID_MACRO_LB_EVENTLists the events that are relevant to the macros that are currently assigned to the selected object./ahelp/paragraph +paragraph role=paragraph id=par_id3149763 xml-lang=en-US l10n=U oldref=4ahelp hid=cui/ui/eventassignpage/assignmentsLists the events that are relevant to the macros that are currently assigned to the selected object./ahelp/paragraph paragraph role=paragraph id=par_id3150670 xml-lang=en-US l10n=U oldref=23The following table describes the macros and the events that can by linked to objects in your document:/paragraph table id=tbl_id3148944 tablerow @@ -359,9 +359,9 @@ paragraph role=paragraph id=par_id3150432 xml-lang=en-US l10n=U oldref=6Choose the macro that you want to execute when the selected event occurs./paragraph paragraph role=paragraph id=par_id3147296 xml-lang=en-US l10n=U oldref=84Frames allow you to link events to a function, so that the function can determine if it processes the event or $[officename] Writer./paragraph paragraph role=heading id=hd_id3155587 xml-lang=en-US level=3 l10n=U oldref=7Category/paragraph -paragraph role=paragraph id=par_id3154068 xml-lang=en-US l10n=U oldref=8ahelp hid=HID_MACRO_GROUPLists the open $[officename] documents and applications. Click the name of the location where you want to save the macros./ahelp/paragraph +paragraph role=paragraph id=par_id3154068 xml-lang=en-US l10n=U oldref=8ahelp hid=cui/ui/eventassignpage/librariesLists the open $[officename] documents and applications. Click the name of the location where you want to save the macros./ahelp/paragraph paragraph role=heading id=hd_id3149744
[Libreoffice-commits] core.git: include/oox oox/source sw/qa
include/oox/export/drawingml.hxx |2 ++
oox/source/export/drawingml.cxx |2 +-
sw/qa/extras/ooxmlexport/data/dml-textshape.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4
4 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 6063555744ed89d8a757b667cddcdd4357839466
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jan 23 13:34:34 2014 +0100
drawingML export: fix position of shape in case rotation is 180 degrees
This is the other case when position shouldn't be adjusted.
Change-Id: I9265bf1c762fd519e3a12e97d767b5d213644e6d
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 65ae6f3..31c6f20 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -28,6 +28,8 @@
#include tools/poly.hxx
#include filter/msfilter/escherex.hxx
#ifndef PPTX_EXPORT_ROTATE_CLOCKWISIFY
+// Our rotation is counter-clockwise and is in 100ths of a degree.
+// drawingML rotation is clockwise and is in 6ths of a degree.
#define PPTX_EXPORT_ROTATE_CLOCKWISIFY(input) ((2160-input*600)%2160)
#endif
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2fde292..db05030 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -751,7 +751,7 @@ void DrawingML::WriteShapeTransformation( Reference XShape
rXShape, sal_Int32
{
SdrObject* pShape = (SdrObject*) GetSdrObjectFromXShape( rXShape );
nRotation=pShape-GetRotateAngle();
-if (nRotation)
+if (nRotation != 0 nRotation != 18000)
{
int faccos=bFlipV ? -1 : 1;
int facsin=bFlipH ? -1 : 1;
diff --git a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
index b98eea7..28e39c2 100644
Binary files a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx and
b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c18277c..9ce53cb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2492,6 +2492,10 @@ DECLARE_OOXMLEXPORT_TEST(testDmlTextshape,
dml-textshape.docx)
// Connector was incorrectly shifted towards the top left corner, X was
552, Y was 0.
CPPUNIT_ASSERT_EQUAL(sal_Int32(4018), xShape-getPosition().X);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1256), xShape-getPosition().Y);
+
+xShape.set(xGroup-getByIndex(5), uno::UNO_QUERY);
+// This was incorrectly shifted towards the top of the page, Y was 106.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1016), xShape-getPosition().Y);
}
DECLARE_OOXMLEXPORT_TEST(testDrawinglayerPicPos, drawinglayer-pic-pos.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Library_htmlfd.mk filter/Module_filter.mk filter/source postprocess/Rdb_services.mk Repository.mk solenv/gbuild
Repository.mk |1
filter/Library_htmlfd.mk | 36 ++
filter/Module_filter.mk |1
filter/source/config/fragments/types/generic_HTML.xcu |2
filter/source/htmlfilterdetect/fdcomp.cxx | 36 ++
filter/source/htmlfilterdetect/filterdetect.cxx | 232 ++
filter/source/htmlfilterdetect/filterdetect.hxx | 64
filter/source/htmlfilterdetect/htmlfd.component | 15 +
postprocess/Rdb_services.mk |1
solenv/gbuild/extensions/pre_MergedLibsList.mk|1
10 files changed, 388 insertions(+), 1 deletion(-)
New commits:
commit cc2893834d8ac699dbb38b152f21f17f3debb06b
Author: Maxim Monastirsky momonas...@gmail.com
Date: Mon Jan 20 10:17:05 2014 +0200
related: fdo#73682 Introduce HTML detection service
Change-Id: I66bb579019ce8411b821c623955a454fd81cf811
Reviewed-on: https://gerrit.libreoffice.org/7600
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/Repository.mk b/Repository.mk
index 6c4d488..7066001 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -270,6 +270,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(ENABLE_DIRECTX),gdipluscanvas) \
guesslang \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
+ htmlfd \
i18npool \
i18nsearch \
hyphen \
diff --git a/filter/Library_htmlfd.mk b/filter/Library_htmlfd.mk
new file mode 100644
index 000..a147509
--- /dev/null
+++ b/filter/Library_htmlfd.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_Library_Library,htmlfd))
+
+$(eval $(call
gb_Library_set_componentfile,htmlfd,filter/source/htmlfilterdetect/htmlfd))
+
+$(eval $(call gb_Library_use_external,xmlfd,boost_headers))
+
+$(eval $(call gb_Library_use_sdk_api,htmlfd))
+
+$(eval $(call gb_Library_use_libraries,htmlfd,\
+ ucbhelper \
+ cppuhelper \
+ cppu \
+ sal \
+ tl \
+ utl \
+ svt \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,htmlfd,\
+ filter/source/htmlfilterdetect/fdcomp \
+ filter/source/htmlfilterdetect/filterdetect \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 403184a..58307b4 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_exp) \
Library_filterconfig \
Library_flash \
+ Library_htmlfd \
Library_icd \
Library_icg \
Library_idx \
diff --git a/filter/source/config/fragments/types/generic_HTML.xcu
b/filter/source/config/fragments/types/generic_HTML.xcu
index ede6d2b..58ffedc 100644
--- a/filter/source/config/fragments/types/generic_HTML.xcu
+++ b/filter/source/config/fragments/types/generic_HTML.xcu
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
--
node oor:name=generic_HTML oor:op=replace
-prop
oor:name=DetectServicevaluecom.sun.star.text.FormatDetector/value/prop
+prop
oor:name=DetectServicevaluecom.sun.star.comp.filters.HtmlFilterDetect/value/prop
prop
oor:name=URLPatternvalueprivate:factory/swriter/web*/value/prop
prop oor:name=Extensionsvaluehtml htm/value/prop
prop oor:name=MediaTypevaluetext/html/value/prop
diff --git a/filter/source/htmlfilterdetect/fdcomp.cxx
b/filter/source/htmlfilterdetect/fdcomp.cxx
new file mode 100644
index 000..40360e9
--- /dev/null
+++ b/filter/source/htmlfilterdetect/fdcomp.cxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include sal/config.h
+
+#include cppuhelper/factory.hxx
+#include cppuhelper/implementationentry.hxx
+#include sal/types.h
+
+#include filterdetect.hxx
+
+namespace {
+
+static cppu::ImplementationEntry const services[] = {
+{ HtmlFilterDetect_createInstance,
HtmlFilterDetect_getImplementationName,
+ HtmlFilterDetect_getSupportedServiceNames,
+ cppu::createSingleComponentFactory, 0, 0 },
+{ 0, 0, 0,
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #36 from Marcos Souza marcos.souza@gmail.com --- Hi guys, I saw OSL_NETWORD, but it seems to bu unused inside the code. I'm missing something? Can you guys give an example of how to use this...? Thanks a lot since now! -- 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 Bug 65675 depends on bug 71884, which changed state. Bug 71884 Summary: Error starting 4.2RC1 (32-bit) on OS X https://bugs.freedesktop.org/show_bug.cgi?id=71884 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- 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: distro-configs/LibreOfficeMacOSX64.conf distro-configs/LibreOfficeMacOSX.conf
distro-configs/LibreOfficeMacOSX.conf |1 - distro-configs/LibreOfficeMacOSX64.conf |1 - 2 files changed, 2 deletions(-) New commits: commit 1e54386411055b0049760faff2e1374a83191913 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 23 16:26:56 2014 +0100 Official TDF Mac builds are done w/o ext-wiki-publisher ...since LO 4.1.3, cf. http://lists.freedesktop.org/archives/libreoffice/2013-October/057006.html minutes of ESC call ..., and the underlying issue (Java extension's Addons.xcu causing JVM instantiation upon start of Writer on Mac) has not been addressed since, and Norbert confirmed on IRC that he did the disabling by locally specifying --disable-ext-wiki-publisher on the build machines and continues to use that configuration for all builds since (LO 4.1.4, 4.2.0, 32- and 64-bit), so better reflect that directly in distro-configs. Change-Id: Ib40588a5a6e49f7b9f58df8f1f4eb146de003444 diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index a10bbd9..1298b9d 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -2,7 +2,6 @@ --enable-epm --enable-scripting-beanshell --enable-scripting-javascript ---enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-extension-integration --enable-online-update diff --git a/distro-configs/LibreOfficeMacOSX64.conf b/distro-configs/LibreOfficeMacOSX64.conf index 73a50b5..c93ed7c 100644 --- a/distro-configs/LibreOfficeMacOSX64.conf +++ b/distro-configs/LibreOfficeMacOSX64.conf @@ -3,7 +3,6 @@ --enable-epm --enable-scripting-beanshell --enable-scripting-javascript ---enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-extension-integration --enable-online-update ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Library_htmlfd.mk
filter/Library_htmlfd.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 976ccb9374cf06af3f5699b567da753167bdf029 Author: Tor Lillqvist t...@collabora.com Date: Thu Jan 23 17:48:54 2014 +0200 Typo Change-Id: Id95e261bdd5b34e1c412f2a7be39f8cc4a89ead7 diff --git a/filter/Library_htmlfd.mk b/filter/Library_htmlfd.mk index a147509..cfb708b 100644 --- a/filter/Library_htmlfd.mk +++ b/filter/Library_htmlfd.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Library_Library,htmlfd)) $(eval $(call gb_Library_set_componentfile,htmlfd,filter/source/htmlfilterdetect/htmlfd)) -$(eval $(call gb_Library_use_external,xmlfd,boost_headers)) +$(eval $(call gb_Library_use_external,htmlfd,boost_headers)) $(eval $(call gb_Library_use_sdk_api,htmlfd)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/bcfea44da2811940578f248080951eb320420f
6a/bcfea44da2811940578f248080951eb320420f |1 + 1 file changed, 1 insertion(+) New commits: commit 8fa657ca5302c88d20beeb3028dc9eef2722ff80 Author: Caolán McNamara caol...@redhat.com Date: Thu Jan 23 16:02:42 2014 + Notes added by 'git notes add' diff --git a/6a/bcfea44da2811940578f248080951eb320420f b/6a/bcfea44da2811940578f248080951eb320420f new file mode 100644 index 000..524581f --- /dev/null +++ b/6a/bcfea44da2811940578f248080951eb320420f @@ -0,0 +1 @@ +merged as: 65464fdf04cdadc602d53ef7fda81f0f0647ad46 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 12 commits - chart2/source cppcanvas/source cui/source dbaccess/source extensions/source filter/source include/sfx2 sax/source sc/source sd/source sfx2/source svtools/s
chart2/source/controller/dialogs/dlg_NumberFormat.cxx |2
chart2/source/view/main/VLegend.cxx | 15 +
cppcanvas/source/mtfrenderer/emfplus.cxx |9 +
cui/source/customize/macropg.cxx |2
cui/source/customize/selector.cxx |2
cui/source/dialogs/SpellDialog.cxx|2
cui/source/options/cuisrchdlg.cxx |2
cui/source/options/dbregister.cxx |2
cui/source/tabpages/connect.cxx |2
cui/source/tabpages/dstribut.cxx |2
cui/source/tabpages/macroass.cxx |2
cui/source/tabpages/measure.cxx |2
cui/source/tabpages/numfmt.cxx|2
dbaccess/source/ui/dlg/TablesSingleDlg.cxx|2
extensions/source/propctrlr/formcomponenthandler.cxx |2
filter/source/msfilter/escherex.cxx | 25 +--
include/sfx2/basedlgs.hxx | 53 +-
sax/source/expatwrap/saxwriter.cxx| 82 +-
sc/source/filter/oox/workbookfragment.cxx |5
sc/source/ui/condformat/condformatdlg.cxx |1
sc/source/ui/miscdlgs/inscodlg.cxx|6
sc/source/ui/pagedlg/tphf.cxx |8 -
sd/source/ui/dlg/sdtreelb.cxx |6
sd/source/ui/dlg/tpaction.cxx |2
sd/source/ui/inc/sdtreelb.hxx |3
sfx2/source/dialog/basedlgs.cxx | 140 +-
svtools/source/contnr/treelistentry.cxx | 13 -
svx/source/tbxctrls/grafctrl.cxx |2
sw/source/core/text/itratr.cxx|4
sw/source/ui/chrdlg/drpcps.cxx|2
sw/source/ui/chrdlg/tblnumfm.cxx |2
sw/source/ui/config/mailconfigpage.cxx|2
sw/source/ui/config/optload.cxx |4
sw/source/ui/dialog/addrdlg.cxx |2
sw/source/ui/fldui/fldedt.cxx |2
sw/source/ui/frmdlg/pattern.cxx |2
sw/source/ui/frmdlg/wrap.cxx |2
37 files changed, 137 insertions(+), 281 deletions(-)
New commits:
commit 917b6afecde47bdc282a5182e26c2421253fd804
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 15:55:37 2014 +
coverity#1158463 Uninitialized scalar field
Change-Id: Idcbbb3b05e8425616696a2508d05dc9dfd670aa5
diff --git a/chart2/source/view/main/VLegend.cxx
b/chart2/source/view/main/VLegend.cxx
index 1f7b46e..1eca2b2 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -782,13 +782,14 @@ VLegend::VLegend(
const std::vector LegendEntryProvider* rLegendEntryProviderList,
const Reference drawing::XShapes xTargetPage,
const Reference lang::XMultiServiceFactory xFactory,
-ChartModel rModel ) :
-m_xTarget(xTargetPage),
-m_xShapeFactory(xFactory),
-m_xLegend( xLegend ),
-mrModel(rModel),
-m_xContext( xContext ),
-m_aLegendEntryProviderList( rLegendEntryProviderList )
+ChartModel rModel )
+: m_xTarget(xTargetPage)
+, m_xShapeFactory(xFactory)
+, m_xLegend(xLegend)
+, mrModel(rModel)
+, m_xContext(xContext)
+, m_aLegendEntryProviderList(rLegendEntryProviderList)
+, m_nDefaultWritingMode(text::WritingMode2::LR_TB)
{
}
commit 77e25e13babec17c8e442fd599ad71fc51aa98db
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 15:51:57 2014 +
coverity#1158464 Uninitialized scalar field
Change-Id: I73fc73421ab1abcc801bb4372e9584fcbf381bcf
diff --git a/svtools/source/contnr/treelistentry.cxx
b/svtools/source/contnr/treelistentry.cxx
index bf04b1e..60a960f 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -47,12 +47,13 @@ void SvTreeListEntry::InvalidateChildrensListPositions()
nListPos |= 0x8000;
}
-SvTreeListEntry::SvTreeListEntry() :
-pParent(NULL),
-nAbsPos(0),
-nListPos(0),
-pUserData(NULL),
-nEntryFlags(0)
+SvTreeListEntry::SvTreeListEntry()
+: pParent(NULL)
+, nAbsPos(0)
+, nListPos(0)
+, bIsMarked(false)
+, pUserData(NULL)
+, nEntryFlags(0)
{
}
commit 0b500f6dab5ca1bea29630f43abb9a14be1d4e4c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 15:49:54 2014 +
coverity#1158465 Uninitialized pointer field
Change-Id: Ic53e3f8165595ef2b8a6241003bce736f936db3a
diff --git a/cui/source/customize/selector.cxx
b/cui/source/customize/selector.cxx
index 87bed53..82df036 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@
[Libreoffice-commits] core.git: 2 commits - svx/source sw/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |7 ---
sw/source/core/doc/docedt.cxx |8 ++--
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 5a4766857ad3c9172847197a262e25c1926cbab2
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:07:04 2014 +
coverity#1158448 Uninitialized scalar field
Change-Id: I189503d88d54b32b20d5f866687214cb4af35200
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 2816f8d..2a0a14a 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -60,7 +60,9 @@ struct _SaveRedline
sal_Int32 nEndCnt;
_SaveRedline( SwRangeRedline* pR, const SwNodeIndex rSttIdx )
-: pRedl( pR )
+: pRedl(pR)
+, nEnd(0)
+, nEndCnt(0)
{
const SwPosition* pStt = pR-Start(),
* pEnd = pR-GetMark() == pStt ? pR-GetPoint() : pR-GetMark();
@@ -80,7 +82,9 @@ struct _SaveRedline
}
_SaveRedline( SwRangeRedline* pR, const SwPosition rPos )
-: pRedl( pR )
+: pRedl(pR)
+, nEnd(0)
+, nEndCnt(0)
{
const SwPosition* pStt = pR-Start(),
* pEnd = pR-GetMark() == pStt ? pR-GetPoint() : pR-GetMark();
commit 4bc75ba3eb07bac4c079d5de8cac6de10d93c0f1
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:05:25 2014 +
coverity#1158462 Uninitialized pointer field
Change-Id: Ie5b72f4d3f357e76e233ccf412e2f5863a6999dc
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 8cedb04..2cbdc93 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -348,9 +348,10 @@ css::uno::Reference css::frame::XStatusListener
SearchToolbarControllersManag
// FindTextToolbarController
FindTextToolbarController::FindTextToolbarController( const
css::uno::Reference css::uno::XComponentContext rxContext )
-:svt::ToolboxController( rxContext,
-css::uno::Reference css::frame::XFrame (),
-OUString(COMMAND_FINDTEXT) )
+: svt::ToolboxController(rxContext, css::uno::Reference
css::frame::XFrame (), OUString(COMMAND_FINDTEXT))
+, m_pFindTextFieldControl(NULL)
+, m_nDownSearchId(0)
+, m_nUpSearchId(0)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx | 25 +
1 file changed, 13 insertions(+), 12 deletions(-)
New commits:
commit be090d5a50d5c38d22303e88c1866c827aeab057
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:14:29 2014 +
coverity#1158444 Uninitialized scalar field
Change-Id: I15f6c6288e2a951543702a15e777167f2240899e
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index a3e201c..2c18bb2 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -390,19 +390,20 @@ Entity::Entity( const ParserData rData ) :
mpProducedEvents = 0;
}
-Entity::Entity( const Entity e ) :
-ParserData( e )
-,mbEnableThreads(e.mbEnableThreads)
-,maStructSource(e.maStructSource)
-,mpParser(e.mpParser)
-,maConverter(e.maConverter)
-,maSavedException(e.maSavedException)
-,maNamespaceStack(e.maNamespaceStack)
-,maContextStack(e.maContextStack)
-,maNamespaceCount(e.maNamespaceCount)
-,maNamespaceDefines(e.maNamespaceDefines)
+Entity::Entity(const Entity e)
+: ParserData(e)
+, mnProducedEventsSize(0)
+, mpProducedEvents(NULL)
+, mbEnableThreads(e.mbEnableThreads)
+, maStructSource(e.maStructSource)
+, mpParser(e.mpParser)
+, maConverter(e.maConverter)
+, maSavedException(e.maSavedException)
+, maNamespaceStack(e.maNamespaceStack)
+, maContextStack(e.maContextStack)
+, maNamespaceCount(e.maNamespaceCount)
+, maNamespaceDefines(e.maNamespaceDefines)
{
-mpProducedEvents = 0;
}
Entity::~Entity()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - distro-configs/LibreOfficeMacOSX.conf
distro-configs/LibreOfficeMacOSX.conf |1 - 1 file changed, 1 deletion(-) New commits: commit 23b4c7f045ec572c9f885a6c111300ed6efc335a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jan 23 16:26:56 2014 +0100 Official TDF Mac builds are done w/o ext-wiki-publisher ...since LO 4.1.3, cf. http://lists.freedesktop.org/archives/libreoffice/2013-October/057006.html minutes of ESC call ..., and the underlying issue (Java extension's Addons.xcu causing JVM instantiation upon start of Writer on Mac) has not been addressed since, and Norbert confirmed on IRC that he did the disabling by locally specifying --disable-ext-wiki-publisher on the build machines and continues to use that configuration for all builds since (LO 4.1.4, 4.2.0, 32- and 64-bit), so better reflect that directly in distro-configs. (cherry picked from commit 1e54386411055b0049760faff2e1374a83191913) Conflicts: distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeMacOSX64.conf Change-Id: Ib40588a5a6e49f7b9f58df8f1f4eb146de003444 Reviewed-on: https://gerrit.libreoffice.org/7614 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 367d4c8..faf89d2 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -3,7 +3,6 @@ --enable-scripting-beanshell --enable-scripting-javascript --enable-ext-presenter-minimizer ---enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-extension-integration --enable-online-update ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libabw
external/libabw/UnpackedTarball_libabw.mk |1
external/libabw/libabw-0.0.1-badtable.patch.1 | 100 ++
2 files changed, 101 insertions(+)
New commits:
commit 6f52d472393e4d92c0a4d988f28312edaeb5775c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 23 17:12:35 2014 +0100
Don't crash on unstarted table
Change-Id: I68e596ea37133c89206333e8ca8aa3602878d2fc
diff --git a/external/libabw/UnpackedTarball_libabw.mk
b/external/libabw/UnpackedTarball_libabw.mk
index 4f8b440..8e28755 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.1-inttypes.patch.1 \
external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
+ external/libabw/libabw-0.0.1-badtable.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1
b/external/libabw/libabw-0.0.1-badtable.patch.1
new file mode 100644
index 000..ddb0c8f
--- /dev/null
+++ b/external/libabw/libabw-0.0.1-badtable.patch.1
@@ -0,0 +1,100 @@
+--- a/src/lib/ABWContentCollector.cpp
b/src/lib/ABWContentCollector.cpp
+@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
+
+ void libabw::ABWContentCollector::openCell(const char *props)
+ {
+- if (props)
+-parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
+- int currentRow(0);
+- if (!findInt(_findCellProperty(top-attach), currentRow))
+-currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
+- while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
++ if (!m_ps-m_tableStates.empty())
+ {
+-if (m_ps-m_tableStates.top().m_currentTableRow = 0)
+- _closeTableRow();
+-_openTableRow();
+- }
++if (props)
++ parsePropString(props,
m_ps-m_tableStates.top().m_currentCellProperties);
++int currentRow(0);
++if (!findInt(_findCellProperty(top-attach), currentRow))
++ currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
++while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
++{
++ if (m_ps-m_tableStates.top().m_currentTableRow = 0)
++_closeTableRow();
++ _openTableRow();
++}
+
+- if (!findInt(_findCellProperty(left-attach),
m_ps-m_tableStates.top().m_currentTableCol))
+-m_ps-m_tableStates.top().m_currentTableCol++;
++if (!findInt(_findCellProperty(left-attach),
m_ps-m_tableStates.top().m_currentTableCol))
++ m_ps-m_tableStates.top().m_currentTableCol++;
++ }
+ }
+
+ void libabw::ABWContentCollector::closeCell()
+ {
+- _closeTableCell();
+- m_ps-m_tableStates.top().m_currentCellProperties.clear();
++ if (!m_ps-m_tableStates.empty())
++ {
++_closeTableCell();
++m_ps-m_tableStates.top().m_currentCellProperties.clear();
++ }
+ }
+
+ void libabw::ABWContentCollector::collectData(const char *, const char *,
const WPXBinaryData )
+--- a/src/lib/ABWStylesCollector.cpp
b/src/lib/ABWStylesCollector.cpp
+@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
+
+ void libabw::ABWStylesCollector::openCell(const char *props)
+ {
+- if (props)
+-parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
+- int currentRow(0);
+- if (!findInt(_findCellProperty(top-attach), currentRow))
+-currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
+- while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
+-m_ps-m_tableStates.top().m_currentTableRow++;
+-
+- if (!m_ps-m_tableStates.empty() 0 ==
m_ps-m_tableStates.top().m_currentTableRow)
++ if (!m_ps-m_tableStates.empty())
+ {
+-int leftAttach(0);
+-int rightAttach(0);
+-if (findInt(_findCellProperty(left-attach), leftAttach)
findInt(_findCellProperty(right-attach), rightAttach))
+- m_ps-m_tableStates.top().m_currentTableWidth += rightAttach -
leftAttach;
+-else
+- m_ps-m_tableStates.top().m_currentTableWidth++;
++if (props)
++ parsePropString(props,
m_ps-m_tableStates.top().m_currentCellProperties);
++int currentRow(0);
++if (!findInt(_findCellProperty(top-attach), currentRow))
++ currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
++while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
++ m_ps-m_tableStates.top().m_currentTableRow++;
++
++if (0 == m_ps-m_tableStates.top().m_currentTableRow)
++{
++ int leftAttach(0);
++ int rightAttach(0);
++ if (findInt(_findCellProperty(left-attach), leftAttach)
findInt(_findCellProperty(right-attach), rightAttach))
++m_ps-m_tableStates.top().m_currentTableWidth += rightAttach -
leftAttach;
++ else
++m_ps-m_tableStates.top().m_currentTableWidth++;
++}
+ }
+ }
+
+ void libabw::ABWStylesCollector::closeCell()
+ {
+-
[Libreoffice-commits] core.git: 2 commits - sax/source sw/source
sax/source/expatwrap/sax_expat.cxx |3 ++
sw/source/core/text/pormulti.hxx | 41 +++--
2 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit d9d28895f7fcf1b05b77507e32f6aba1d5ef4305
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:11:55 2014 +
coverity#1158445 Uninitialized pointer field
Change-Id: I14dc2197543bf98763190b5aea3a366e823312b4
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index a5edfc5..6608a4d 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -228,6 +228,9 @@ public:
SaxExpatParser_Impl()
: sCDATA(CDATA)
, m_bEnableDoS(false)
+, pAttrList(NULL)
+, bExceptionWasThrown(false)
+, bRTExceptionWasThrown(false)
{
}
commit 303c62e297b338c93edfc52a9697263da7cf0315
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:10:14 2014 +
coverity#1158446 Uninitialized scalar field
Change-Id: I66135f813adbf25c69e667f9ac0198edf7bbc12d
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index fda3fbb..4590e79 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -86,7 +86,7 @@ class SwMultiPortion : public SwLinePortion
sal_Bool bTab1 :1; // First line tabulator
sal_Bool bTab2 :1; // Second line includes tabulator
sal_Bool bDouble:1; // Double line
-bool bRuby :1; // Phonetics
+bool bRuby :1; // Phonetics
sal_Bool bBidi :1;
sal_Bool bTop :1; // Phonetic position
sal_Bool bFormatted :1; // Already formatted
@@ -94,20 +94,31 @@ class SwMultiPortion : public SwLinePortion
sal_uInt8 nDirection:2; // Direction (0/90/180/270 degrees)
sal_Bool bFlyInCntnt:1; // Fly as character inside
protected:
-SwMultiPortion( sal_Int32 nEnd ) : pFldRest( 0 ), bTab1( sal_False ),
-bTab2( sal_False ), bDouble( sal_False ), bRuby( false ),
-bBidi( sal_False ), bFormatted( sal_False ), bFollowFld( sal_False ),
-nDirection( 0 ), bFlyInCntnt( sal_False )
-{ SetWhichPor( POR_MULTI ); SetLen( nEnd ); }
-inline void SetDouble() { bDouble = sal_True; }
-inline void SetRuby() { bRuby = true; }
-inline void SetBidi() { bBidi = sal_True; }
-inline void SetTop( sal_Bool bNew ) { bTop = bNew; }
-inline void SetTab1( sal_Bool bNew ) { bTab1 = bNew; }
-inline void SetTab2( sal_Bool bNew ) { bTab2 = bNew; }
-inline void SetDirection( sal_uInt8 nNew ) { nDirection = nNew; }
-inline sal_Bool GetTab1() const { return bTab1; }
-inline sal_Bool GetTab2() const { return bTab2; }
+SwMultiPortion(sal_Int32 nEnd)
+: pFldRest(0)
+, bTab1(false)
+, bTab2(false)
+, bDouble(false)
+, bRuby(false)
+, bBidi(false)
+, bTop(false)
+, bFormatted(false)
+, bFollowFld(false)
+, nDirection(0)
+, bFlyInCntnt(false)
+{
+SetWhichPor(POR_MULTI);
+SetLen(nEnd);
+}
+void SetDouble() { bDouble = sal_True; }
+void SetRuby() { bRuby = true; }
+void SetBidi() { bBidi = sal_True; }
+void SetTop( sal_Bool bNew ) { bTop = bNew; }
+void SetTab1( sal_Bool bNew ) { bTab1 = bNew; }
+void SetTab2( sal_Bool bNew ) { bTab2 = bNew; }
+void SetDirection( sal_uInt8 nNew ) { nDirection = nNew; }
+sal_Bool GetTab1() const { return bTab1; }
+sal_Bool GetTab2() const { return bTab2; }
public:
~SwMultiPortion();
const SwLineLayout GetRoot() const { return aRoot; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/libabw
external/libabw/UnpackedTarball_libabw.mk |1
external/libabw/libabw-0.0.1-badtable.patch.1 | 100 ++
2 files changed, 101 insertions(+)
New commits:
commit dbc758affabcac8a93e44bada0ae59e556c9cdbf
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Thu Jan 23 17:12:35 2014 +0100
Don't crash on unstarted table
Change-Id: I68e596ea37133c89206333e8ca8aa3602878d2fc
(cherry picked from commit 6f52d472393e4d92c0a4d988f28312edaeb5775c)
Reviewed-on: https://gerrit.libreoffice.org/7616
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/external/libabw/UnpackedTarball_libabw.mk
b/external/libabw/UnpackedTarball_libabw.mk
index 4f8b440..8e28755 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
external/libabw/libabw-0.0.1-inttypes.patch.1 \
external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
+ external/libabw/libabw-0.0.1-badtable.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1
b/external/libabw/libabw-0.0.1-badtable.patch.1
new file mode 100644
index 000..ddb0c8f
--- /dev/null
+++ b/external/libabw/libabw-0.0.1-badtable.patch.1
@@ -0,0 +1,100 @@
+--- a/src/lib/ABWContentCollector.cpp
b/src/lib/ABWContentCollector.cpp
+@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
+
+ void libabw::ABWContentCollector::openCell(const char *props)
+ {
+- if (props)
+-parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
+- int currentRow(0);
+- if (!findInt(_findCellProperty(top-attach), currentRow))
+-currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
+- while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
++ if (!m_ps-m_tableStates.empty())
+ {
+-if (m_ps-m_tableStates.top().m_currentTableRow = 0)
+- _closeTableRow();
+-_openTableRow();
+- }
++if (props)
++ parsePropString(props,
m_ps-m_tableStates.top().m_currentCellProperties);
++int currentRow(0);
++if (!findInt(_findCellProperty(top-attach), currentRow))
++ currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
++while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
++{
++ if (m_ps-m_tableStates.top().m_currentTableRow = 0)
++_closeTableRow();
++ _openTableRow();
++}
+
+- if (!findInt(_findCellProperty(left-attach),
m_ps-m_tableStates.top().m_currentTableCol))
+-m_ps-m_tableStates.top().m_currentTableCol++;
++if (!findInt(_findCellProperty(left-attach),
m_ps-m_tableStates.top().m_currentTableCol))
++ m_ps-m_tableStates.top().m_currentTableCol++;
++ }
+ }
+
+ void libabw::ABWContentCollector::closeCell()
+ {
+- _closeTableCell();
+- m_ps-m_tableStates.top().m_currentCellProperties.clear();
++ if (!m_ps-m_tableStates.empty())
++ {
++_closeTableCell();
++m_ps-m_tableStates.top().m_currentCellProperties.clear();
++ }
+ }
+
+ void libabw::ABWContentCollector::collectData(const char *, const char *,
const WPXBinaryData )
+--- a/src/lib/ABWStylesCollector.cpp
b/src/lib/ABWStylesCollector.cpp
+@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
+
+ void libabw::ABWStylesCollector::openCell(const char *props)
+ {
+- if (props)
+-parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
+- int currentRow(0);
+- if (!findInt(_findCellProperty(top-attach), currentRow))
+-currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
+- while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
+-m_ps-m_tableStates.top().m_currentTableRow++;
+-
+- if (!m_ps-m_tableStates.empty() 0 ==
m_ps-m_tableStates.top().m_currentTableRow)
++ if (!m_ps-m_tableStates.empty())
+ {
+-int leftAttach(0);
+-int rightAttach(0);
+-if (findInt(_findCellProperty(left-attach), leftAttach)
findInt(_findCellProperty(right-attach), rightAttach))
+- m_ps-m_tableStates.top().m_currentTableWidth += rightAttach -
leftAttach;
+-else
+- m_ps-m_tableStates.top().m_currentTableWidth++;
++if (props)
++ parsePropString(props,
m_ps-m_tableStates.top().m_currentCellProperties);
++int currentRow(0);
++if (!findInt(_findCellProperty(top-attach), currentRow))
++ currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
++while (m_ps-m_tableStates.top().m_currentTableRow currentRow)
++ m_ps-m_tableStates.top().m_currentTableRow++;
++
++if (0 == m_ps-m_tableStates.top().m_currentTableRow)
++{
++ int leftAttach(0);
++ int rightAttach(0);
++ if (findInt(_findCellProperty(left-attach), leftAttach)
findInt(_findCellProperty(right-attach), rightAttach))
++
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/core/data/rtf/pass/fdo54641.rtf | 39 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 +++-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 +
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 018bbe6c538d99c2f14fd4c761048848dc458f4a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jan 23 17:04:38 2014 +0100
fdo#69649 RTF import: don't crash on empty TOC result
Regression from commit 9679e9c23216decb5f9f25f85b04cb3f2521
(fdo#69649 Fix for pre-rendered Table Of Contents, 2013-12-30), the
situation that the field doesn't have a result wasn't handled, resulting
in a m_aTextAppendStack.pop() call in dmapper, without a matching
.push() one.
Change-Id: I456d9096d01fb27832a40f6b72802ec555d62647
diff --git a/sw/qa/core/data/rtf/pass/fdo54641.rtf
b/sw/qa/core/data/rtf/pass/fdo54641.rtf
new file mode 100644
index 000..25a3f7e
--- /dev/null
+++ b/sw/qa/core/data/rtf/pass/fdo54641.rtf
@@ -0,0 +1,39 @@
+{\rtf1
+{\stylesheet
+{\s0\qj\widctlpar\f0\fs20 \snext0 Normal;}
+{\cs10 \additive\ssemihidden Default Paragraph Font;}
+{\s1\qc\sb240\sa120\keepn\f0\b\fs40 \sbasedon0\snext0 Part;}
+{\s2\ql\sb240\sa120\keepn\f0\b\fs40 \sbasedon0\snext0 heading 1;}
+{\s3\ql\sb240\sa120\keepn\f0\b\fs32 \sbasedon0\snext0 heading 2;}
+}
+\paperw11960\paperh16900\margl2500\margr2560\margt2520\margb1820\pgnstart0\widowctrl\qj\ftnbj\f0\aftnnar
+{\pard\plain\s20\qc\sb240\sa240\b\f0\fs36\sl240\slmult1 \fi0 De titel van het
testfile\par
+\pard\plain\s21\qc\sa120\f0\fs20\sl240\slmult1 \sb120 \fi0 \chdate \par
+\pard\plain\s80\ql\sb240\sa120\keepn\f0\b\fs20\sl240\slmult1 \sb120 \fi0
Inhoudsopgave\par
+\pard\plain\s0\qj\widctlpar\f0\fs20\sl240\slmult1 \sb120 \fi0 \par
+{\field
+{\*\fldinst TOC \\o 1-3 }
+{\fldrslt }
+}
+\page
+\pard\plain\s0\qj\widctlpar\f0\fs20\sl240\slmult1 \sb180 \fi0
+{}
+\par
+\pard\plain\ql\sb240\sa120\keepn\f0\b\fs40\sl240\slmult1 \sb120 \fi0 Hoofdstuk
1\par
+\pard\plain\s2\ql\sb240\sa120\keepn\f0\b\fs40\sl240\slmult1 \sb360 \fi0 De
eerste test\par
+\pard\plain\s0\qj\widctlpar\f0\fs20\sl240\slmult1 \sb360 \fi0 In dit hoofdstuk
zullen de eerste tests uitgevoerd worden.\par
+\pard\plain\s3\ql\sb240\sa120\keepn\f0\b\fs32\sl240\slmult1 \sb360 \fi0 1.1
Figuren\par
+{\pard\plain\s31\qc\sb120\sa0\keep\widctlpar\f0\fs20\sl240\slmult1 \sb420 \fi0
+{\pict\picscalex92\picscaley92\piccropl0\piccropr0\piccropt0\piccropb0
+\picw20032\pich2725\picwgoal5357\pichgoal1545\pngblip\bliptag-1891142031
+{\*\blipuid 8f477671d3377e167ce61bb2e9de72f7}
+47494638396110001000d5ffffc0c0c0555f00aafcfcfcf6f6f6eaeaeae6e6e6e4e4e4e3e3e3c2c2c2c1c1c1bcbcbcb5b5b5b3b3b3b0b0b0adadada5a5a5a2a2a2a1a1a19f9f9f9494948a8a8a888686867b7b7b6c6c6c5c5c5c4e4e4e4b4b4b4747474646463d3d3d3c3c3c2e2e2e2525251b1b1b1818181010100909090606060303030021f9040102002c1000100684408170482c0a06c8a4728924389f506833b281302a8e6b164b18103024c52111504cca67332102e0042e9a40d9319f8300a343c1200f54e47f7e2a1e0b0a7d0d728a010d838400261a7c0d94947784252700127e9d159f6c8411140019080ea7a9a85f842122281612b1b3b25d6b1f29291d0fbbbdbc5d5e51c34e4cc64a46c94341003b
+}
+\par
+}
+\pard\plain\s0\qj\widctlpar\f0\fs20\sl240\slmult1 \sb240 \fi0 De test wordt
gevormd door een enkele, simpele figuur
+[
+].\par
+\pard\plain\s3\ql\sb240\sa120\keepn\f0\b\fs32\sl240\slmult1 \sb360 \fi0 1.2
Tabellen\par
+}
+}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1d44373..74173fd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -145,6 +145,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsColumnBreakDeferred( false ),
m_bIsPageBreakDeferred( false ),
m_bStartTOC(false),
+m_bStartedTOC(false),
m_bTOCPageRef(false),
m_pLastSectionContext( ),
m_pLastCharacterContext(),
@@ -1164,6 +1165,7 @@ void DomainMapper_Impl::appendTextPortion( const
OUString rString, PropertyMapP
{
if (m_bStartTOC)
{
+m_bStartedTOC = true;
uno::Reference text::XTextCursor xTOCTextCursor;
xTOCTextCursor = xTextAppend-getEnd()-getText(
)-createTextCursor( );
xTOCTextCursor-gotoEnd(false);
@@ -3584,7 +3586,11 @@ void DomainMapper_Impl::PopFieldContext()
if( xToInsert.is() )
{
m_bStartTOC = false;
-m_aTextAppendStack.pop();
+if (m_bStartedTOC)
+{
+m_aTextAppendStack.pop();
+m_bStartedTOC = false;
+}
if(xTOCMarkerCursor.is())
[Libreoffice-commits] core.git: 4 commits - sax/source sw/CppunitTest_sw_htmlexport.mk sw/source
sax/source/fastparser/fastparser.cxx |9 ++---
sw/CppunitTest_sw_htmlexport.mk |1 +
sw/source/core/text/pormulti.cxx | 18 --
3 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit 5d42a1db69aa8b5acf215e21744eb6baf5b02758
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:31:56 2014 +
fix tinderboxes
Change-Id: I36dc46852dfa14fc3c9195b1f4fd85198a665e22
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 0179bdd..0345d4c 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_htmlexport,\
configmgr/source/configmgr \
embeddedobj/util/embobj \
filter/source/config/cache/filterconfig1 \
+filter/source/htmlfilterdetect/htmlfd \
forms/util/frm \
framework/util/fwk \
i18npool/util/i18npool \
commit 03dbf44d1958e5cfec2b866ee450d3f8a6bbd370
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:30:08 2014 +
coverity#1158441 Uninitialized scalar field
Change-Id: Ic898ce7a38000f6f07ed7116801bb463f915ca4b
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 25d6ae9..2ac0a19 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -290,8 +290,12 @@
SwDoubleLinePortion::SwDoubleLinePortion(SwDoubleLinePortion rDouble, sal_Int32
* internetstyle, which contains the 2-line-attribute.
* --*/
-SwDoubleLinePortion::SwDoubleLinePortion( const SwMultiCreator rCreate,
-sal_Int32 nEnd ) : SwMultiPortion( nEnd ), pBracket( new SwBracket() )
+SwDoubleLinePortion::SwDoubleLinePortion(const SwMultiCreator rCreate,
sal_Int32 nEnd)
+: SwMultiPortion(nEnd)
+, pBracket(new SwBracket())
+, nLineDiff(0)
+, nBlank1(0)
+, nBlank2(0)
{
SetDouble();
const SvxTwoLinesItem* pTwo = (SvxTwoLinesItem*)rCreate.pItem;
commit b3fd6a6d9e21f030186d304417c516d369a58a3e
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:28:23 2014 +
coverity#1158442 Uninitialized scalar field
Change-Id: I39ec7882d240703281a535f81375580d48720f5e
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 0ca8077..25d6ae9 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -260,10 +260,12 @@ sal_Int32 SwBidiPortion::GetSpaceCnt( const SwTxtSizeInfo
rInf ) const
* brackets, these will be deleted.
* --*/
-SwDoubleLinePortion::SwDoubleLinePortion( SwDoubleLinePortion rDouble,
- sal_Int32 nEnd ) :
-SwMultiPortion( nEnd ),
-pBracket( 0 )
+SwDoubleLinePortion::SwDoubleLinePortion(SwDoubleLinePortion rDouble,
sal_Int32 nEnd)
+: SwMultiPortion(nEnd)
+, pBracket(0)
+, nLineDiff(0)
+, nBlank1(0)
+, nBlank2(0)
{
SetDirection( rDouble.GetDirection() );
SetDouble();
commit c5135af60f4e82fafed4557ae73a4f13435d1d61
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:16:43 2014 +
coverity#1158443 Uninitialized pointer field
Change-Id: I1602678c24c1aeec60acee05801e7decc914560f
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 2c18bb2..ff384f0 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -384,10 +384,13 @@ ParserData::~ParserData()
//
-Entity::Entity( const ParserData rData ) :
-ParserData( rData )
+Entity::Entity(const ParserData rData)
+: ParserData(rData)
+, mnProducedEventsSize(0)
+, mpProducedEvents(NULL)
+, mbEnableThreads(false)
+, mpParser(NULL)
{
-mpProducedEvents = 0;
}
Entity::Entity(const Entity e)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #37 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #36) I saw OSL_NETWORD, but it seems to bu unused inside the code. I'm missing something? Is part of the published URE API, so even if it is unused in LO itself, I wouldn't remove it. (Not that it is likely used much in 3rd party code either, but it is IMO too little a code cruft to actually worry about.) Can you guys give an example of how to use this...? As the documentation says, swapping between host and network byte order. -- 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: solenv/bin
solenv/bin/native-code.py |1 + 1 file changed, 1 insertion(+) New commits: commit 691da8335641e531a648c7ce09563d60999622fc Author: Tor Lillqvist t...@collabora.com Date: Thu Jan 23 18:58:18 2014 +0200 Need com_sun_star_comp_framework_PathSettings_get_implementation Change-Id: I8d629c3b7f860ebe1c6e6d6cd761a876597b33b3 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 2c91640..ee8f5d5 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -57,6 +57,7 @@ core_constructor_list = [ com_sun_star_comp_framework_JobExecutor_get_implementation, com_sun_star_comp_framework_LayoutManager_get_implementation, com_sun_star_comp_framework_ModuleManager_get_implementation, +com_sun_star_comp_framework_PathSettings_get_implementation, com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation, com_sun_star_comp_framework_URLTransformer_get_implementation, # sax/source/expatwrap/expwrap.component ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - connectivity/source sfx2/source writerfilter/source
connectivity/source/parse/sqliterator.cxx|5 +++--
sfx2/source/dialog/partwnd.cxx |5 +++--
writerfilter/source/dmapper/DomainMapperTableHandler.hxx |6 --
3 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 38e26f75854e299333a731343ba9d81bfb45272f
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 17:00:30 2014 +
coverity#1158417 Uninitialized scalar field
Change-Id: I120eb012151b799b84974222c08b02d0cb73975c
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 342eb74..4536aac 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -57,8 +57,10 @@ struct HorizontallyMergedCell
sal_Int32 m_nLastRow;
sal_Int32 m_nLastCol;
HorizontallyMergedCell(sal_Int32 nFirstRow, sal_Int32 nFirstCol)
-: m_nFirstRow(nFirstRow),
-m_nFirstCol(nFirstCol)
+: m_nFirstRow(nFirstRow)
+, m_nFirstCol(nFirstCol)
+, m_nLastRow(0)
+, m_nLastCol(0)
{
}
};
commit c634df5815d68b58ec9a7a19272bfb4a4053e4e8
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:42:29 2014 +
coverity#440721 Dereference after null check
Change-Id: I1a6d6f5d83f3b6c5f8d8d19b003f2e4f6976d6e9
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index a0de0f5..63b1562 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -61,8 +61,9 @@ SfxPartChildWnd_Impl::SfxPartChildWnd_Impl
// Create Window
pWindow = new SfxPartDockWnd_Impl( pBindings, this, pParentWnd,
WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK );
eChildAlignment = SFX_ALIGN_TOP;
-if ( pInfo )
-pInfo-nFlags |= SFX_CHILDWIN_FORCEDOCK;
+
+assert(pInfo);
+pInfo-nFlags |= SFX_CHILDWIN_FORCEDOCK;
((SfxDockingWindow*)pWindow)-SetFloatingSize( Size( 175, 175 ) );
pWindow-SetSizePixel( Size( 175, 175 ) );
commit 09c749cc5787be8d17ac5ddf0bc9aa0aead92d6b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 16:39:42 2014 +
coverity#440711 Explicit null dereferenced
Change-Id: I794ac29dc81b1d42b959135277284de1f8c33ccf
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 06b07ca..ae9fff2 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1249,9 +1249,10 @@ bool
OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele
return false;
}
-if (! SQL_ISRULE(pWhereClause,where_clause)) {
+if (!pWhereClause || !SQL_ISRULE(pWhereClause,where_clause))
+{
// The WHERE clause is optional most of the time; which means it could
be a optional_where_clause.
-
OSL_ENSURE(SQL_ISRULE(pWhereClause,opt_where_clause),OSQLParseTreeIterator:
error in parse tree!);
+OSL_ENSURE(pWhereClause
SQL_ISRULE(pWhereClause,opt_where_clause),OSQLParseTreeIterator: error in
parse tree!);
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_test.h.in configure.ac sw/qa
config_host/config_test.h.in | 10 ++
configure.ac | 47 +++
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 ++
3 files changed, 61 insertions(+)
New commits:
commit c4ffca21ff7c020c7df2c6de7cbd16fc20cac989
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Wed Jan 22 15:43:40 2014 +
Depend unit test on existing font.
Commit 734cf8395 introduced a unit test, which depends on a Calibri
metric-compatible font. So this adds a fonctconfig based check to
configure and just runs this test, if configure finds a correctly
mapped font.
Reviewed on:
https://gerrit.libreoffice.org/7596
Change-Id: I5255a4366684b115d88adca78ab2002864b63766
diff --git a/config_host/config_test.h.in b/config_host/config_test.h.in
new file mode 100644
index 000..c310350b
--- /dev/null
+++ b/config_host/config_test.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for test suite dependencies.
+*/
+
+#ifndef CONFIG_TEST_H
+#define CONFIG_TEST_H
+
+#define TEST_FONTS_MISSING 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index a6f5b42..04547a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11520,6 +11520,31 @@ AC_SUBST(SUNTEMPLATES_FR_PACK)
AC_SUBST(SUNTEMPLATES_HU_PACK)
AC_SUBST(SUNTEMPLATES_IT_PACK)
+TEST_FONTS_MISSING=0
+
+# $1 = font family
+# $2+ = accepted font mappings
+test_font_map()
+{
+FONT=$1 ; shift
+AC_MSG_CHECKING([Checking font mapping for '$FONT'])
+FONTFILE=$(basename `$FCMATCH -f '%{file}' $FONT`)
+
+TESTEXPR='${FONTFILE}' = '$1.ttf'
+while true ; do
+MAPPING=$1 ; shift
+test -n $MAPPING || break
+TESTEXPR=${TESTEXPR} -o '$FONTFILE' = '$MAPPING-Regular.ttf'
+done
+if test $TESTEXPR
+then
+AC_MSG_RESULT([ok])
+else
+AC_MSG_RESULT([unknown ($FONTFILE)])
+TEST_FONTS_MISSING=1
+fi
+}
+
dnl ===
dnl Test whether to include fonts
dnl ===
@@ -11532,8 +11557,29 @@ else
AC_MSG_RESULT([no])
WITH_FONTS=NO
SCPDEFS=$SCPDEFS -DWITHOUT_FONTS
+if test $test_fontconfig = yes; then
+AC_PATH_PROG([FCMATCH], [fc-match])
+if test -z $FCMATCH; then
+AC_MSG_WARN([Unable to query installed fonts - unit tests
disabled.])
+TEST_FONTS_MISSING=1
+else
+#test_font_map 'Arial' 'LiberationSans'
+#test_font_map 'Arial Narrow' 'LiberationSansNarrow'
+test_font_map 'Calibri' 'Carlito'
+#test_font_map 'Cambria' 'Caladea'
+#test_font_map 'Courier New' 'LiberationMono'
+#test_font_map 'Times New Roman' 'LiberationSerif'
+if test ${TEST_FONTS_MISSING} -eq 1
+then
+AC_MSG_WARN([Unknown font mappings - unit tests disabled.])
+fi
+fi
+else
+TEST_FONTS_MISSING=0
+fi
fi
AC_SUBST(WITH_FONTS)
+AC_DEFINE_UNQUOTED([TEST_FONTS_MISSING], $TEST_FONTS_MISSING)
dnl ===
dnl Test whether to include ppds
@@ -12762,6 +12808,7 @@ AC_CONFIG_HEADERS([config_host/config_orcus.h])
AC_CONFIG_HEADERS([config_host/config_kde4.h])
AC_CONFIG_HEADERS([config_host/config_mingw.h])
AC_CONFIG_HEADERS([config_host/config_oox.h])
+AC_CONFIG_HEADERS([config_host/config_test.h])
AC_CONFIG_HEADERS([config_host/config_telepathy.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ac5c8c65..4dabefe 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -6,6 +6,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include config_test.h
+
#include swmodeltestbase.hxx
#if !defined(WNT)
@@ -972,9 +974,11 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation,
groupshape-child-rotation
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape-getPosition().X);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xShape-getPosition().Y);
+#if ! TEST_FONTS_MISSING
xShape.set(xGroupShape-getByIndex(4), uno::UNO_QUERY);
// This was 887, i.e. border distances were included in the height.
CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape-getSize().Height);
+#endif
uno::Referencedrawing::XShapeDescriptor
xShapeDescriptor(xGroupShape-getByIndex(5), uno::UNO_QUERY);
// This was com.sun.star.drawing.RectangleShape, all shape text in a
single line.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/source xmlreader/source
sc/inc/viewuno.hxx|2 +-
sc/source/ui/Accessibility/AccessibleCell.cxx |4 ++--
sc/source/ui/Accessibility/AccessibleContextBase.cxx |4 ++--
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx |3 ++-
sc/source/ui/inc/AccessibleCell.hxx |4 ++--
sc/source/ui/inc/AccessibleContextBase.hxx|4 ++--
sc/source/ui/inc/AccessiblePreviewTable.hxx |2 +-
sc/source/ui/unoobj/viewuno.cxx |4 ++--
xmlreader/source/xmlreader.cxx|2 ++
9 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit 194cfbfa2a5fb7b8a4598729aede48d5a221f61c
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 17:22:05 2014 +
coverity#1158407 Uncaught exception
Change-Id: Ib8830798250b9c4f143743de4389260fceb44aa3
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 42b14f4..09a852e 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -647,7 +647,8 @@ Rectangle
ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::R
return aCellRect;
}
-Rectangle ScAccessiblePreviewTable::GetBoundingBox() const throw
(uno::RuntimeException)
+Rectangle ScAccessiblePreviewTable::GetBoundingBox() const
+throw (uno::RuntimeException, std::exception)
{
FillTableInfo();
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx
b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index 795badc..5840702 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -156,7 +156,7 @@ protected:
virtual OUString SAL_CALL createAccessibleName(void) throw
(::com::sun::star::uno::RuntimeException);
virtual Rectangle GetBoundingBoxOnScreen(void) const
throw(::com::sun::star::uno::RuntimeException);
-virtual Rectangle GetBoundingBox(void) const throw
(::com::sun::star::uno::RuntimeException);
+virtual Rectangle GetBoundingBox() const throw
(::com::sun::star::uno::RuntimeException, std::exception);
private:
ScPreviewShell* mpViewShell;
commit a5c401df84df2be26a6a2351a7d5c9d65524d8a9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 17:20:06 2014 +
coverity#1158408 Uncaught exception
Change-Id: Ie0a3cfeedeb386e72749997e6a4bdf8b6c515be2
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index eddaed3..fc97d4b 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -80,7 +80,7 @@ public:
// XViewPane
virtual sal_Int32 SAL_CALL getFirstVisibleColumn()
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFirstVisibleColumn( sal_Int32
nFirstVisibleColumn )
-throw(::com::sun::star::uno::RuntimeException);
+throw(::com::sun::star::uno::RuntimeException,
std::exception);
virtual sal_Int32 SAL_CALL getFirstVisibleRow()
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFirstVisibleRow( sal_Int32 nFirstVisibleRow )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 3095a78..369cb4e 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -206,8 +206,8 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn()
throw(uno::RuntimeExc
return 0;
}
-void SAL_CALL ScViewPaneBase::setFirstVisibleColumn( sal_Int32
nFirstVisibleColumn )
-throw(uno::RuntimeException)
+void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32
nFirstVisibleColumn)
+throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if (pViewShell)
commit 98a3def98cd6e43dcce51de9694dcc895ad7a36a
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 17:16:19 2014 +
coverity#1158410 Uncaught exception
mdds::general_error is thrown but is luckily inherited from std::exception
so
use the new ability of 0bc89aac4c64bb833e387657f680e194c26aef97 cppumaker:
Allow UNO interface functions to throw std::exception.
Change-Id: I2c1d30e0806281d43c7bec103d4c85e1799c5b4f
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 742496c..cb319a4 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -166,8 +166,8 @@ Rectangle ScAccessibleCell::GetBoundingBoxOnScreen(void)
const
return aCellRect;
}
-Rectangle ScAccessibleCell::GetBoundingBox(void) const
-throw (uno::RuntimeException)
+Rectangle ScAccessibleCell::GetBoundingBox() const
+throw
[ANN] LibreOffice 4.2.0 RC3 available
Dear Community, The Document Foundation is pleased to announce the third release candidate of LibreOffice 4.2.0. The upcoming 4.2.0 will bring new features and lots of bugfixes. Check out https://wiki.documentfoundation.org/ReleaseNotes/4.2 for an (incomplete and work-in-progress) list of the new features. Please be aware that LibreOffice 4.2.0 RC3 is not been flagged as ready for production use yet, you should continue to use LibreOffice 4.1.4 for that. 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/ LibreOffice 4.2.0 RC3 is also available in a 64bit version for Mac OS X 10.8 (or newer) Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details). Beginning with RC2, the debug symbols are also source-indexed. 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/get-involved/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.2.0 RC3 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.0/RC3 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
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessibleContextBase.cxx |4 ++--
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx |2 +-
sc/source/ui/inc/AccessibleContextBase.hxx |4 ++--
sc/source/ui/inc/AccessiblePreviewCell.hxx |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 14f4e2fa22a0a2576808bab08edaf2e12f761cd8
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 17:26:10 2014 +
coverity#1158406 Uncaught exception
Change-Id: I856ead663734cfa3c87c67eb461ff63160213349
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 662a190..2817822 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -573,8 +573,8 @@ void ScAccessibleContextBase::CommitFocusLost() const
vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
}
-Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen(void) const
-throw (uno::RuntimeException)
+Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen() const
+throw (uno::RuntimeException, std::exception)
{
OSL_FAIL(not implemented);
return Rectangle();
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 291b539..991b496 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -213,7 +213,7 @@ uno::Sequencesal_Int8 SAL_CALL
// internal =
-Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw
(uno::RuntimeException)
+Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw
(uno::RuntimeException, std::exception)
{
Rectangle aCellRect;
if (mpViewShell)
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx
b/sc/source/ui/inc/AccessibleContextBase.hxx
index 6b06ba6..526eeec 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -270,8 +270,8 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
/// Return the object's current bounding box relative to the desktop.
-virtual Rectangle GetBoundingBoxOnScreen(void) const
-throw (::com::sun::star::uno::RuntimeException);
+virtual Rectangle GetBoundingBoxOnScreen() const
+throw (::com::sun::star::uno::RuntimeException, std::exception);
/// Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox() const
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx
b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index b5f0394..692ed11 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -87,7 +87,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
protected:
-virtual Rectangle GetBoundingBoxOnScreen(void) const
throw(::com::sun::star::uno::RuntimeException);
+virtual Rectangle GetBoundingBoxOnScreen() const
throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual Rectangle GetBoundingBox(void) const throw
(::com::sun::star::uno::RuntimeException);
private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added CC||libreoffice-ux-advise@lists ||.freedesktop.org --- Comment #16 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- (In reply to comment #14) [...] I doubt anyone just wants to start the application. One wants to create a document or presentation or... So, to be consistent, you should commit a patch to remove the StartCenter, including for the MS-Windows version. Very strange idea to remove the visibility of the StartCenter when we create a new one. If Linux distributions maintainers do not want give the access to the StartCenter and the Math module, they can do that in their distro build without deciding for all Linux users. Best regards. JBF -- 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: cppuhelper/source desktop/source extensions/source forms/source include/rtl jvmfwk/plugins jvmfwk/source sal/qa scripting/source sc/source sd/source starmath/source sto
cppuhelper/source/implbase_ex.cxx |2
desktop/source/deployment/registry/executable/dp_executable.cxx |2
extensions/source/update/check/updatecheck.cxx |4
forms/source/xforms/model_helper.hxx|4
include/rtl/strbuf.hxx | 25 ++
include/rtl/string.hxx | 70 +++
include/rtl/ustrbuf.hxx | 25 ++
include/rtl/ustring.hxx | 100
+-
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |6
jvmfwk/plugins/sunmajor/pluginlib/util.hxx |4
jvmfwk/source/framework.cxx |8
sal/qa/rtl/process/rtl_Process.cxx |2
sal/qa/rtl/strings/test_oustring_stringliterals.cxx |1
sal/qa/rtl/uri/rtl_Uri.cxx |4
sc/source/core/data/patattr.cxx |2
scripting/source/provider/MasterScriptProvider.cxx |2
sd/source/ui/view/drviews7.cxx |2
starmath/source/mathmlimport.cxx|4
stoc/source/security/permissions.cxx|4
svl/source/items/poolio.cxx |4
svx/source/xml/xmleohlp.cxx |2
sw/source/core/txtnode/txtedt.cxx |3
sw/source/core/unocore/unotbl.cxx |2
sw/source/ui/chrdlg/chardlg.cxx |8
sw/source/ui/config/optcomp.cxx |4
sw/source/ui/inc/chrdlg.hxx |2
sw/source/ui/inc/swcont.hxx |2
sw/source/ui/index/swuiidxmrk.cxx |2
unotools/source/config/compatibility.cxx|4
vcl/source/filter/graphicfilter.cxx |2
xmloff/source/forms/elementimport.cxx |4
31 files changed, 179 insertions(+), 131 deletions(-)
New commits:
commit e3133ae2371b6e2d4b47daa6a3487ea4f2753315
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jan 23 18:43:53 2014 +0100
Let C++ inline functions return bool instead of sal_Bool
...to improve diagnosing misuses of boolean expressions in client code (cf.
compilerplugins/clang/implicitboolconversion.cxx). This change should be
transparent to client code.
Missing overloads of insert() for bool have been added to OStringBuffer and
OUStringBuffer (which required dropping one !VALID_CONVERSION check that
would
now pick that overload, but would be flagged by
compilerplugins/clang/pointertobool.cxx).
Change-Id: I2d64cd923b8f47bfaa31e753def6515c29a3f8c9
diff --git a/cppuhelper/source/implbase_ex.cxx
b/cppuhelper/source/implbase_ex.cxx
index aeb054a..c2a87fb 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -73,7 +73,7 @@ static inline bool __td_equals(
SAL_THROW(())
{
return ((pTDR1 == pTDR2) ||
-((OUString const *)pTDR1-pTypeName)-equals( *(OUString const
*)pTDR2-pTypeName ) != sal_False);
+((OUString const *)pTDR1-pTypeName)-equals( *(OUString const
*)pTDR2-pTypeName ));
}
//--
static inline type_entry * __getTypeEntries( class_data * cd )
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx
b/desktop/source/deployment/registry/executable/dp_executable.cxx
index b84c95a..927aa4f 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -284,7 +284,7 @@ bool
BackendImpl::ExecutablePackageImpl::isUrlTargetInExtension()
if (osl::File::E_None == osl::File::getAbsoluteFileURL(
OUString(), dp_misc::expandUnoRcUrl(m_url), sFile))
{
-if (sal_True == sFile.match(sExtensionDir, 0))
+if (sFile.match(sExtensionDir, 0))
bSuccess = true;
}
}
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index 5eac7a0..f38d745 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -117,7 +117,7 @@ static inline OUString getBaseInstallation()
inline bool isObsoleteUpdateInfo(const OUString rBuildId)
{
-return sal_True != rBuildId.equals(getBuildId()) !rBuildId.isEmpty();
+return !rBuildId.equals(getBuildId()) !rBuildId.isEmpty();
}
@@ -1267,7 +1267,7 @@
Re: Efficient UNO component linkage GC ...
On Wed, 2014-01-22 at 10:22 +0100, Stephan Bergmann wrote: FYI, I envisioned a road where ultimately a (new-style) UNO service's different constructors rather directly map to a C++ implementation class's different constructors. * One main reason for introducing those constructor functions in the first place is to allow (in specific scenarios) for direct calls of them from client code, bypassing the service manager. I think it is beneficial to test that direct-call scenario as much as possible while working on this, that is why I created the manual scaffolding of osl/detail/component-defines.h. Right, makes sense, so I've added some we use from sfx2, svtools, svx in http://cgit.freedesktop.org/libreoffice/core/commit/?id=a69875fbfcab0c4f0069aeb72079155789c35256 Experimental direct constructor calls for more services. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #17 from David Tardon dtar...@redhat.com --- (In reply to comment #16) (In reply to comment #14) [...] I doubt anyone just wants to start the application. One wants to create a document or presentation or... So, to be consistent, you should commit a patch to remove the StartCenter, including for the MS-Windows version. Very strange idea to remove the visibility of the StartCenter when we create a new one. To be honest, I do not care much either way. And _if_ this was changed as a result of a discussion (or a bug) that said: Hey, we have a shiny new start center. Let's all the users see it!, I would not say anything. But it was not, so I see it as a regression. If Linux distributions maintainers do not want give the access to the StartCenter and the Math module, they can do that in their distro build without deciding for all Linux users. Well, we tend to assume the majority of linux users gets libreoffice through their distribution. And the last time this come up, more distro maintainers were for disabling than against it. If that has changed, so be it. We patched it in Fedora before; we can do it again... Note that math has been hidden since 3.5 and nobody has protested. Startcenter was only hidden in 4.1, but I do not remember any bugs related to that either... -- 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 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #18 from Samuel M. s.mehrbr...@gmail.com --- Well, I don't think the start center is of great use for Linux users. For Windows it's ok, you need to put something on their desktop so they can find the program they installed. But I doubt there are many Linux users who use the start center. I have it there since 4.1 but have never opened it. But I'm not sure what's the reason Math is hidden. -- 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 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=70133 --- Comment #19 from Maxim Monastirsky momonas...@gmail.com --- (In reply to comment #17) Startcenter was only hidden in 4.1, but I do not remember any bugs related to that either... There is Bug 70133. Also keep in mind that Debian/Ubuntu patched 4.1 to re-enable the start center, and that might be the reason we don't have many reports about it. -- 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 - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 21 +
sc/qa/unit/ucalc.hxx|2 ++
sc/source/core/data/column3.cxx |2 +-
3 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 228cd29a48374833bbe305a434f7149a0ef3ddd1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jan 23 14:07:25 2014 -0500
fdo#73986: Write unit test for document statistics.
Change-Id: I8ff51fda91627b365cf71be8849d07b92b447ba9
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 357f596..111b940 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -634,6 +634,27 @@ void Test::testInput()
m_pDoc-DeleteTab(0);
}
+void Test::testDocStatistics()
+{
+SCTAB nStartTabs = m_pDoc-GetTableCount();
+m_pDoc-InsertTab(0, Sheet1);
+CPPUNIT_ASSERT_MESSAGE(Failed to increment sheet count.,
m_pDoc-GetTableCount() == nStartTabs+1);
+m_pDoc-InsertTab(1, Sheet2);
+CPPUNIT_ASSERT_MESSAGE(Failed to increment sheet count.,
m_pDoc-GetTableCount() == nStartTabs+2);
+
+CPPUNIT_ASSERT_EQUAL(static_castsal_uLong(0), m_pDoc-GetCellCount());
+m_pDoc-SetValue(ScAddress(0,0,0), 2.0);
+CPPUNIT_ASSERT_EQUAL(static_castsal_uLong(1), m_pDoc-GetCellCount());
+m_pDoc-SetValue(ScAddress(2,2,0), 2.5);
+CPPUNIT_ASSERT_EQUAL(static_castsal_uLong(2), m_pDoc-GetCellCount());
+m_pDoc-SetString(ScAddress(1,1,1), Test);
+CPPUNIT_ASSERT_EQUAL(static_castsal_uLong(3), m_pDoc-GetCellCount());
+
+m_pDoc-DeleteTab(1);
+CPPUNIT_ASSERT_MESSAGE(Failed to decrement sheet count.,
m_pDoc-GetTableCount() == nStartTabs+1);
+m_pDoc-DeleteTab(0); // This may fail in case there is only one sheet in
the document.
+}
+
void Test::testDataEntries()
{
m_pDoc-InsertTab(0, Test);
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 1dbfbbc..f6007ff 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -83,6 +83,7 @@ public:
void testSharedStringPool();
void testRangeList();
void testInput();
+void testDocStatistics();
/**
* The 'data entries' data is a list of strings used for suggestions as
@@ -314,6 +315,7 @@ public:
CPPUNIT_TEST(testSharedStringPool);
CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
+CPPUNIT_TEST(testDocStatistics);
CPPUNIT_TEST(testDataEntries);
CPPUNIT_TEST(testSelectionFunction);
CPPUNIT_TEST(testFormulaCreateStringFromTokens);
commit 9ce7ba209d28cd284ab5ea584bc130d7a081b0f9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jan 23 14:06:34 2014 -0500
fdo#73986: Don't forget to receive returned object from for_each.
Change-Id: Ia4ccb83c45ea3ce72a8e5c62a560ab1802bb2441
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 7675271..798d544 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2433,7 +2433,7 @@ public:
SCSIZE ScColumn::GetCellCount() const
{
CellCounter aFunc;
-std::for_each(maCells.begin(), maCells.end(), aFunc);
+aFunc = std::for_each(maCells.begin(), maCells.end(), aFunc);
return aFunc.getCount();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx|2 --
writerfilter/source/dmapper/StyleSheetTable.cxx |7 +--
writerfilter/source/doctok/resources.xmi| 12
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +++---
4 files changed, 4 insertions(+), 23 deletions(-)
New commits:
commit 5e2f54d8b2c3e80e2e347e9bb00df4f8fcc2252e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jan 23 21:20:47 2014 +0100
writerfilter: NS_rtf::LN_SGC - NS_ooxml::LN_CT_Style_type
Change-Id: Ie684da85620e14ae1f10c1fc8dd00ea738fafe54
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 20e64dc..82e36bd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -223,8 +223,6 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
break;
case NS_rtf::LN_FMASSCOPY:
break;
-case NS_rtf::LN_SGC:
-break;
case NS_rtf::LN_ISTDBASE:
break;
case NS_rtf::LN_CUPX:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index c7c098b..0ced6b0 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -414,7 +414,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value val)
// to point to a different object.
if( m_pImpl-m_pCurrentEntry-nStyleTypeCode == STYLE_TYPE_UNKNOWN )
{
-if( Name != NS_rtf::LN_SGC Name != NS_ooxml::LN_CT_Style_type )
+if( Name != NS_ooxml::LN_CT_Style_type )
m_pImpl-m_pCurrentEntry-nStyleTypeCode = STYLE_TYPE_PARA;
}
switch(Name)
@@ -431,11 +431,6 @@ void StyleSheetTable::lcl_attribute(Id Name, Value val)
m_pImpl-m_pCurrentEntry-bIsDefaultStyle = true;
}
break;
-case NS_rtf::LN_SGC:
-SAL_WARN_IF( m_pImpl-m_pCurrentEntry-nStyleTypeCode !=
STYLE_TYPE_UNKNOWN,
-writerfilter, Style type needs to be processed first );
-m_pImpl-m_pCurrentEntry-nStyleTypeCode = (StyleType)nIntValue;
-break;
case NS_rtf::LN_ISTDBASE:
if (static_castsal_uInt32(nIntValue) != 0xfff)
m_pImpl-m_pCurrentEntry-sBaseStyleIdentifier =
OUString::number(nIntValue, 16);
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 3ed1167e..869d155 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -248,18 +248,6 @@
/UML:Attribute
/UML:Classifier.feature
UML:Classifier.feature
-UML:Attribute name=sgc
- UML:ModelElement.taggedValue
-UML:TaggedValue
-
UML:TaggedValue.dataValuertf:SGC/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=attrid/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
-/UML:Attribute
- /UML:Classifier.feature
- UML:Classifier.feature
UML:Attribute name=istdBase
UML:ModelElement.taggedValue
UML:TaggedValue
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 6705664..a73c903 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1057,7 +1057,7 @@ void RTFDocumentImpl::text(OUString rString)
break;
case DESTINATION_STYLESHEET:
case DESTINATION_STYLEENTRY:
-if
(m_aStates.top().aTableAttributes.find(NS_rtf::LN_SGC))
+if
(m_aStates.top().aTableAttributes.find(NS_ooxml::LN_CT_Style_type))
{
RTFValue::Pointer_t pValue(new
RTFValue(m_aStates.top().aDestinationText.makeStringAndClear()));
m_aStates.top().aTableSprms.set(NS_ooxml::LN_CT_Style_name, pValue);
@@ -3016,7 +3016,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_nCurrentStyleIndex = nParam;
m_aStates.top().aTableAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
RTFValue::Pointer_t pValue(new RTFValue(1));
-m_aStates.top().aTableAttributes.set(NS_rtf::LN_SGC,
pValue); // paragraph style
+
m_aStates.top().aTableAttributes.set(NS_ooxml::LN_CT_Style_type, pValue); //
paragraph style
}
else
m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD,
pIntValue);
@@ -3028,7 +3028,7 @@ int
[Libreoffice-commits] core.git: sw/source
sw/source/core/edit/ednumber.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a3506eb7254dcda62de0ddfa4fad35870e0d514c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Jan 23 21:27:10 2014 +0100
fdo#42708: bullets should not exit stage left ...
... that is reserved for actors.
Change-Id: I081e811179f12e610c9d8e9727c79bb69c548365
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 431f30f..a56461d 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -362,9 +362,12 @@ void SwEditShell::ChangeIndentOfAllListLevels( short nDiff
)
if (pCurNumRule)
{
SwNumRule aRule(*pCurNumRule);
-// #i90078#
-aRule.ChangeIndent( nDiff );
-
+const SwNumFmt aRootNumFmt(aRule.Get(0));
+if( nDiff 0 || aRootNumFmt.GetIndentAt() + nDiff 0) // fdo#42708
+{
+// #i90078#
+aRule.ChangeIndent( nDiff );
+}
// no start of new list
SetCurNumRule( aRule, false );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - connectivity/source sc/inc sc/source sw/source
connectivity/source/drivers/dbase/DIndex.cxx |8 +++-
connectivity/source/drivers/dbase/dindexnode.cxx |3 ++-
sc/inc/cursuno.hxx |2 +-
sc/source/ui/Accessibility/AccessibleCellBase.cxx |4 ++--
sc/source/ui/Accessibility/AccessibleContextBase.cxx |4 ++--
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx |2 +-
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx |4 ++--
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |4 ++--
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 10 ++
sc/source/ui/inc/AccessibleCellBase.hxx|4 ++--
sc/source/ui/inc/AccessibleContextBase.hxx |4 ++--
sc/source/ui/inc/AccessiblePreviewCell.hxx |2 +-
sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx |4 ++--
sc/source/ui/inc/AccessibleSpreadsheet.hxx |6 --
sc/source/ui/inc/AccessibleTableBase.hxx |6 --
sc/source/ui/unoobj/cursuno.cxx|4 ++--
sw/source/core/frmedt/fefly1.cxx |2 +-
sw/source/core/txtnode/atrfld.cxx |5 -
18 files changed, 43 insertions(+), 35 deletions(-)
New commits:
commit 61360536d775aaf7f6006291b77f4fb9f86ed89d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 20:33:28 2014 +
coverity#440728 Explicit null dereferenced
Change-Id: I76b8d6eb59d2558a7ff8a1b1573f24e41a03b8b6
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx
b/connectivity/source/drivers/dbase/DIndex.cxx
index 55790e9..46237e7 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -557,11 +557,9 @@ sal_Bool ODbaseIndex::CreateImpl()
if(xSet-last())
{
-Reference XUnoTunnel xTunnel(xSet,UNO_QUERY);
-ODbaseResultSet* pDbaseRes = NULL;
-if(xTunnel.is())
-pDbaseRes = reinterpret_cast ODbaseResultSet* (
xTunnel-getSomething(ODbaseResultSet::getUnoTunnelImplementationId()) );
-OSL_ENSURE(pDbaseRes,No dbase resultset found? What's going on
here!);
+Reference XUnoTunnel xTunnel(xSet, UNO_QUERY_THROW);
+ODbaseResultSet* pDbaseRes = reinterpret_cast ODbaseResultSet* (
xTunnel-getSomething(ODbaseResultSet::getUnoTunnelImplementationId()) );
+assert(pDbaseRes); //No dbase resultset found? What's going on here!
ReferenceXRowLocate xRowLocate(xSet,UNO_QUERY);
nRowsLeft = xSet-getRow();
commit e4c7cfed889c4cbfdfc301bd2d501b6b542d3957
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 20:30:51 2014 +
coverity#1130492 Unused pointer value
Change-Id: I4ce6890fcbd88b0751f4902ff314b1207cd5158a
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 7bef646..239d523 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1899,7 +1899,7 @@ sal_Bool SwFEShell::ReplaceSdrObj( const OUString
rGrfName, const OUString rFl
// delete Sdr-Object, insert the graphic instead
DelSelectedObj();
-pFmt = GetDoc()-Insert( *GetCrsr(), rGrfName, rFltName, pGrf,
aFrmSet, NULL, NULL );
+GetDoc()-Insert( *GetCrsr(), rGrfName, rFltName, pGrf, aFrmSet,
NULL, NULL );
EndUndo();
EndAllAction();
commit 0abd70662929c5a7b173be1b41dac4dea434b3e1
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 20:28:39 2014 +
coverity#1158137 Unchecked dynamic_cast
Change-Id: I58b1fe696ab25403838f15928b19460b02a9e97d
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index e1477f1..15c7a38 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -96,7 +96,10 @@ SwFmtFld::SwFmtFld( const SwFmtFld rAttr )
{
// input field in-place editing
SetWhich( RES_TXTATR_INPUTFIELD );
-dynamic_castSwInputField*(GetField())-SetFmtFld( *this );
+SwInputField *pField = dynamic_castSwInputField*(GetField());
+assert(pField);
+if (pField)
+pField-SetFmtFld( *this );
}
else if ( GetField()-GetTyp()-Which() == RES_POSTITFLD )
{
commit 89f7da7ac180dd15a06bef32f447f997e1fdff03
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jan 23 20:25:57 2014 +
coverity#1158204 Unintentional integer overflow
Change-Id: I8e10fb52803dbd81e5490940a9a7e529beebc803
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx
b/connectivity/source/drivers/dbase/dindexnode.cxx
index aabc1c1..963a400 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -848,7 +848,8 @@ SvStream connectivity::dbase::operator
participation in Gsoc 2014
Hello, I am a 2nd year computer science engineering student and I want to take part in Gsoc 2014 by contributing to LibreOffice. I have browsed through the LibreOffice list of ideas for Gsoc 2014. I have some programming experience with C++ and am really keen to apply this knowledge to some practical application . I don't have any prior application development experience but I am willing to be a part of it.Please,if anybody could help me to start contributing to LibreOffice and guide me about the chances of becoming a potential contender for bagging a LibreOffice project in Gsoc 2014 and steps to do so,that would be really appreciated . Thanks Gaurav Agrawal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #20 from David Tardon dtar...@redhat.com --- (In reply to comment #19) (In reply to comment #17) Startcenter was only hidden in 4.1, but I do not remember any bugs related to that either... There is Bug 70133. ... where the reporter does not say why he needs it, just that it is missing. Cue http://xkcd.com/1172/ . Also keep in mind that Debian/Ubuntu patched 4.1 to re-enable the start center, and that might be the reason we don't have many reports about it. But that does not supports the generic unix case. Reciprocally, keep in mind that Fedora has had it disabled for at least 4 releases and we have not had any bug reports concerning that either. Or to open recently edited document. The new start center allows to do that in a convenient way, instead of opening the file browser and navigating through endless folders... And only allows to do that one document at a time, because as soon as you have opened one, the only way to go back to the start center is to close the document. So the user needs to remember two ways to access recently opened documents. (Three, actually, because the desktop typically offers one as well.) But whatever... I have had enough of this discussion. I will revert my earlier commit and just handle it in Fedora. -- 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: cui/uiconfig
cui/uiconfig/ui/colorpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 123a10ea2eca9cd2781e812aef05d2ba175bca51 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Jan 23 21:57:09 2014 +0100 Resolves: fdo#73970 CMYK labels are switched Change-Id: Ie6a2aa5b1123c0ab752e10c4e587ef780784b247 diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 104ba54..7cf9ef6 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -374,7 +374,7 @@ /object packing property name=left_attach0/property -property name=top_attach2/property +property name=top_attach1/property property name=width1/property property name=height1/property /packing @@ -449,7 +449,7 @@ /object packing property name=left_attach0/property -property name=top_attach1/property +property name=top_attach2/property property name=width1/property property name=height1/property /packing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #21 from Tor Lillqvist t...@iki.fi --- David, don't give up! This is just getting fun. -- 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 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #22 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- David Tardon committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a2b2f2d5194313f6a53d35eee39357dbca5f0bd4 Revert regression since fdo#70553 The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: sysui/desktop
sysui/desktop/menus/math.desktop|2 +- sysui/desktop/menus/startcenter.desktop |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a2b2f2d5194313f6a53d35eee39357dbca5f0bd4 Author: David Tardon dtar...@redhat.com Date: Thu Jan 23 21:57:18 2014 +0100 Revert regression since fdo#70553 This reverts commit 12546c8511f0cc8eec0ca7e8cb86ff00dfd429e6. Apparently I stirred a hornet's nest with this. And I have already wasted enough time arguing... diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index a6c150b..57b1734 100755 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -18,7 +18,7 @@ [Desktop Entry] Version=1.0 Terminal=false -NoDisplay=true +NoDisplay=false Icon=math Type=Application Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 2c7ab56..dabe887 100755 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -18,7 +18,7 @@ [Desktop Entry] Version=1.0 Terminal=false -NoDisplay=true +NoDisplay=false Icon=startcenter Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 73993] Summarize additional information in comments
https://bugs.freedesktop.org/show_bug.cgi?id=73993 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Whiteboard||EasyHack DifficultyBeginner ||TopicQA CC||libreoffice@lists.freedeskt ||op.org Ever confirmed|0 |1 -- 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
Re: participation in Gsoc 2014
Hi there, Good to see you are motivated to hack on LibreOffice for Google Summer of Code. In our selection process we want students to have fixed a non-trivial easy hack or bug. And the best way for you to start is to dive into the code right now. Starting to work on the area that interest you can only help you. First steps: * Get the whole thing build * Pick a project idea or easy hack * Read the code and start with small patches. * Submit your patches for review. I hope this helps, -- Cedric On Fri, 2014-01-24 at 02:12 +0530, GAURAV Agrawal wrote: Hello, I am a 2nd year computer science engineering student and I want to take part in Gsoc 2014 by contributing to LibreOffice. I have browsed through the LibreOffice list of ideas for Gsoc 2014. I have some programming experience with C++ and am really keen to apply this knowledge to some practical application . I don't have any prior application development experience but I am willing to be a part of it.Please,if anybody could help me to start contributing to LibreOffice and guide me about the chances of becoming a potential contender for bagging a LibreOffice project in Gsoc 2014 and steps to do so,that would be really appreciated . Thanks Gaurav Agrawal ___ 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
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 73814, which changed state. Bug 73814 Summary: grouped shape in ODG file badly distorted when inserted in Writer document https://bugs.freedesktop.org/show_bug.cgi?id=73814 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE -- 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: sc/inc sc/source
sc/inc/column.hxx |2 +-
sc/inc/formulacell.hxx |3 +++
sc/inc/table.hxx|6 +++---
sc/source/core/data/column.cxx |8
sc/source/core/data/document.cxx| 30 --
sc/source/core/data/formulacell.cxx | 36 ++--
sc/source/core/data/table2.cxx |4 ++--
7 files changed, 51 insertions(+), 38 deletions(-)
New commits:
commit 20b7476142f75b49d10a75e48429a94cff0cec32
Author: Eike Rathke er...@redhat.com
Date: Thu Jan 23 22:40:16 2014 +0100
resolved fdo#71598 postpone SetDirty during Insert/Delete
... until after all listeners are re-established.
Change-Id: I9f6036d4bcc9206191959a88ed5439b9860ca268
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index afe9f6a..3127cf4 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -445,7 +445,7 @@ public:
voidMoveListeners( SvtBroadcaster rSource, SCROW nDestRow );
voidStartAllListeners();
voidStartNeededListeners(); // only for cells where
NeedsListening()==true
-voidSetRelNameDirty();
+voidSetDirtyIfPostponed();
void BroadcastRecalcOnRefMove();
voidCompileDBFormula();
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index dbb52e4..68c620c 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -121,6 +121,7 @@ private:
boolbTableOpDirty : 1; // Dirty flag for TableOp
boolbNeedListening : 1; // Listeners need to be re-established
after UpdateReference
boolmbNeedsNumberFormat : 1; // set the calculated number
format as hard number format
+boolmbPostponedDirty : 1; // if cell needs to be set dirty
later
enum ScInterpretTailParameter
{
@@ -371,6 +372,8 @@ public:
SCROW GetSharedLength() const;
ScTokenArray* GetSharedCode();
const ScTokenArray* GetSharedCode() const;
+
+bool IsPostponedDirty() const;
};
#endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 19dbb00..f7d3389 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -882,10 +882,10 @@ public:
void StartNeededListeners();
/**
- * Mark dirty those formula cells that has named ranges with relative
- * references.
+ * Mark formula cells dirty that have the mbPostponedDirty flag set or
+ * contain named ranges with relative references.
*/
-void SetRelNameDirty();
+void SetDirtyIfPostponed();
/**
* Broadcast dirty formula cells that contain functions such as CELL(),
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index aafb314..007e9e3 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2806,11 +2806,11 @@ struct SetDirtyAfterLoadHandler
}
};
-struct SetRelNameDirtyHandler
+struct SetDirtyIfPostponedHandler
{
void operator() (size_t /*nRow*/, ScFormulaCell* pCell)
{
-if (pCell-HasRelNameReference())
+if (pCell-IsPostponedDirty() || pCell-HasRelNameReference())
pCell-SetDirty();
}
};
@@ -3144,10 +3144,10 @@ public:
}
-void ScColumn::SetRelNameDirty()
+void ScColumn::SetDirtyIfPostponed()
{
sc::AutoCalcSwitch aSwitch(*pDocument, false);
-SetRelNameDirtyHandler aFunc;
+SetDirtyIfPostponedHandler aFunc;
sc::ProcessFormula(maCells, aFunc);
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4d45f56..7a4cbf0 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1167,12 +1167,12 @@ struct StartNeededListenersHandler :
std::unary_functionScTable*, void
}
};
-struct SetRelNameDirtyHandler : std::unary_functionScTable*, void
+struct SetDirtyIfPostponedHandler : std::unary_functionScTable*, void
{
void operator() (ScTable* p)
{
if (p)
-p-SetRelNameDirty();
+p-SetDirtyIfPostponed();
}
};
@@ -1262,12 +1262,13 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB
nStartTab,
for (; it != maTabs.end(); ++it)
if (*it)
(*it)-StartNeededListeners();
-// at least all cells using range names pointing relative
-// to the moved range must recalculate
+// At least all cells using range names pointing relative to the
+// moved range must be recalculated, and all cells marked postponed
+// dirty.
it = maTabs.begin();
for (; it != maTabs.end(); ++it)
if (*it)
-(*it)-SetRelNameDirty();
+(*it)-SetDirtyIfPostponed();
std::for_each(maTabs.begin(), maTabs.end(),
BroadcastRecalcOnRefMoveHandler());
}
@@ -1357,12 +1358,12 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/column3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 09048f24e2a978b043ce5ce8d076721d48ea9342
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Jan 23 14:06:34 2014 -0500
fdo#73986: Don't forget to receive returned object from for_each.
Change-Id: Ia4ccb83c45ea3ce72a8e5c62a560ab1802bb2441
(cherry picked from commit 9ce7ba209d28cd284ab5ea584bc130d7a081b0f9)
Reviewed-on: https://gerrit.libreoffice.org/7620
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 7675271..798d544 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2433,7 +2433,7 @@ public:
SCSIZE ScColumn::GetCellCount() const
{
CellCounter aFunc;
-std::for_each(maCells.begin(), maCells.end(), aFunc);
+aFunc = std::for_each(maCells.begin(), maCells.end(), aFunc);
return aFunc.getCount();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/formulacell.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f013eab80638e732d9cc81af798b2e554c1666fa
Author: Eike Rathke er...@redhat.com
Date: Fri Jan 24 01:23:02 2014 +0100
bring some sense into this translated comment
Change-Id: I1b121fd3f41bafb70a80ae1b01b9b02debbd2dfc
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 75f01d2..435ff6f 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1754,10 +1754,10 @@ void ScFormulaCell::SetDirty( bool bDirtyFlag )
SetDirtyVar();
else
{
-// Multiple Formulas avoid tracking in Load and Copy compileAll
-// by Scenario and Copy Block From Clip.
-// If unconditional required Formula tracking is set before
SetDirty
-// bDirty = false, eg in CompileTokenArray
+// Avoid multiple formula tracking in Load() and in CompileAll()
+// after CopyScenario() and CopyBlockFromClip().
+// If unconditional formula tracking is needed, set bDirty=false
+// before calling SetDirty(), for example in CompileTokenArray().
if ( !bDirty || mbPostponedDirty || !pDocument-IsInFormulaTree(
this ) )
{
if( bDirtyFlag )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/document.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e40f143bb4743f630b06e6d7a11171aa3d43889c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Jan 23 19:50:49 2014 -0500 What's up with this crap!? Change-Id: I8863dbc1e1a8c437885d4363794698b8d8f27edf diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 7a4cbf0..f1d4ff3 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2700,8 +2700,8 @@ void ScDocument::CopyFromClip( const ScRange rDestRange, const ScMarkData rMar if (nR2 nRow2) nR2 = nRow2; -const SCCOLROW PERFORMANCEOPTIMIZATION4PATTERNTHRESHOLD = 8192; -bool bPreallocatePattern = ((nInsFlag IDF_ATTRIB) (nRow2 - nRow1 PERFORMANCEOPTIMIZATION4PATTERNTHRESHOLD)); +const SCCOLROW nThreshold = 8192; +bool bPreallocatePattern = ((nInsFlag IDF_ATTRIB) (nRow2 - nRow1 nThreshold)); std::vector SCTAB vTables; if (bPreallocatePattern) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/formulacell.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 2d041ee46f68caf9760575d971127c27e279d2ef
Author: Eike Rathke er...@redhat.com
Date: Fri Jan 24 01:50:15 2014 +0100
PostponedDirty also for RelName
... so HasRelNameReference() doesn't need to be checked again in
SetDirtyIfPostponed() if already encountered.
Change-Id: I79c6100fbf797d15031d52f402069c977c834f09
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 435ff6f..d7384b9 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2515,7 +2515,6 @@ bool ScFormulaCell::UpdateReferenceOnShift(
// Cell may reference itself, e.g. ocColumn, ocRow without parameter
bOnRefMove = (bValChanged || (aPos != aOldPos));
-bool bHasRelName = false;
bool bNewListening = false;
bool bInDeleteUndo = false;
@@ -2530,7 +2529,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
bInDeleteUndo = (pChangeTrack pChangeTrack-IsInDeleteUndo());
// RelNameRefs are always moved
-bHasRelName = HasRelNameReference();
+bool bHasRelName = HasRelNameReference();
// Reference changed and new listening needed?
// Except in Insert/Delete without specialties.
bNewListening = (bRefModified || bRecompile
@@ -2566,7 +2565,7 @@ bool ScFormulaCell::UpdateReferenceOnShift(
}
}
-if (bNeedDirty !bHasRelName)
+if (bNeedDirty)
{ // Cut off references, invalid or similar?
// Postpone SetDirty() until all listeners have been re-established in
// Inserts/Deletes.
___
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/ui/app/applab.cxx |9 -
sw/source/ui/app/docsh2.cxx | 12 +---
sw/source/ui/dochdl/swdtflvr.cxx | 10 +-
3 files changed, 14 insertions(+), 17 deletions(-)
New commits:
commit 530ddca40fc939a4d6ba6db503f0e49c10af4298
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Jan 24 10:36:12 2014 +0900
Avoid resource leaks in case of exception
Change-Id: I25d012b400ce0f467e6dfa03517bfebd9c945a66
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 735a908..829e3df 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -159,7 +159,7 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
static sal_uInt16 nBCTitleNo = 0;
// Create DB-Manager
-SwNewDBMgr* pNewDBMgr = new SwNewDBMgr;
+boost::scoped_ptrSwNewDBMgr pNewDBMgr(new SwNewDBMgr);
// Read SwLabItem from Config
SwLabCfgItem aLabCfg(bLabel);
@@ -171,7 +171,7 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
SwAbstractDialogFactory* pDialogFactory =
SwAbstractDialogFactory::Create();
OSL_ENSURE(pDialogFactory, SwAbstractDialogFactory fail!);
-boost::scoped_ptrAbstractSwLabDlg pDlg(pDialogFactory-CreateSwLabDlg(0,
aSet, pNewDBMgr, bLabel));
+boost::scoped_ptrAbstractSwLabDlg pDlg(pDialogFactory-CreateSwLabDlg(0,
aSet, pNewDBMgr.get(), bLabel));
OSL_ENSURE(pDlg, Dialogdiet fail!);
if ( RET_OK == pDlg-Execute() )
@@ -277,7 +277,7 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
pSh-ChgPageDesc( 0, aDesc );
// Insert frame
-SwFldMgr*pFldMgr = new SwFldMgr;
+boost::scoped_ptrSwFldMgr pFldMgr(new SwFldMgr);
pFldMgr-SetEvalExpFlds(sal_False);
// Prepare border template
@@ -377,7 +377,7 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
pFldMgr-SetEvalExpFlds(sal_True);
pFldMgr-EvalExpFlds(pSh);
-delete pFldMgr;
+pFldMgr.reset();
if (pFirstFlyFmt)
pSh-GotoFly(pFirstFlyFmt-GetName(), FLYCNTTYPE_ALL,
sal_False);
@@ -400,7 +400,6 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool bLabel)
}
rReq.SetReturnValue(SfxVoidItem(bLabel ? FN_LABEL : FN_BUSINESS_CARD));
}
-delete pNewDBMgr;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 8074f86..d328237 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1433,19 +1433,19 @@ sal_uLong SwDocShell::LoadStylesFromFile( const
OUString rURL,
if ( bImport )
{
SwRead pRead = ReadXML;
-SwReader* pReader = 0;
-SwPaM* pPam = 0;
+boost::scoped_ptrSwReader pReader;
+boost::scoped_ptrSwPaM pPam;
// the SW3IO - Reader need the pam/wrtshell, because only then he
// insert the styles!
if( bUnoCall )
{
SwNodeIndex aIdx( pDoc-GetNodes().GetEndOfContent(), -1 );
-pPam = new SwPaM( aIdx );
-pReader = new SwReader( aMed, rURL, *pPam );
+pPam.reset(new SwPaM( aIdx ));
+pReader.reset(new SwReader( aMed, rURL, *pPam ));
}
else
{
-pReader = new SwReader( aMed, rURL, *pWrtShell-GetCrsr() );
+pReader.reset(new SwReader( aMed, rURL, *pWrtShell-GetCrsr() ));
}
pRead-GetReaderOpt().SetTxtFmts( rOpt.IsTxtFmts() );
@@ -1465,8 +1465,6 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString
rURL,
nErr = pReader-Read( *pRead );
pWrtShell-EndAllAction();
}
-delete pPam;
-delete pReader;
}
return nErr;
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 326b492..6960868 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1160,7 +1160,7 @@ bool SwTransferable::PasteData( TransferableDataHelper
rData,
{
SwWait aWait( *rSh.GetView().
GetDocShell(), false );
-SwTrnsfrActionAndUndo* pAction = 0;
+boost::scoped_ptrSwTrnsfrActionAndUndo pAction;
SwModule* pMod = SW_MOD();
bool nRet = false;
@@ -1214,8 +1214,8 @@ bool SwTransferable::PasteData( TransferableDataHelper
rData,
if( bDelSel )
// #i34830#
-pAction = new SwTrnsfrActionAndUndo( rSh, UNDO_PASTE_CLIPBOARD,
NULL,
- sal_True );
+pAction.reset(new SwTrnsfrActionAndUndo( rSh,
UNDO_PASTE_CLIPBOARD, NULL,
+ sal_True ));
}
SwTransferable *pTrans=0, *pTunneledTrans=GetSwTransferable( rData );
@@ -1260,7 +1260,7 @@ bool SwTransferable::PasteData( TransferableDataHelper
rData,
{
if( !pAction )
{
-pAction = new
LibreOffice Gerrit News for dev-tools on 2014-01-24
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: + Add update-stats-geoip for tracking of updates pings per country. in https://gerrit.libreoffice.org/7613 from Andrzej Hunt * Merged changes on master for project dev-tools changed in the last 25 hours: + Bibisect: Clarify tag code; silently overwrite tags if they exist in https://gerrit.libreoffice.org/6920 from Robinson Tryon + Bibisect: Tweak passed-in commit range to be inclusive in https://gerrit.libreoffice.org/6918 from Robinson Tryon + Bibisect: Factor-out branchName; move initBranch in prep for refactor in https://gerrit.libreoffice.org/6919 from Robinson Tryon + Bibisect: Update the 'latest' tag when the merge is done in https://gerrit.libreoffice.org/6917 from Robinson Tryon + Bibisect: Add comments and USAGE information to script in https://gerrit.libreoffice.org/6916 from Robinson Tryon + Bibisect: mergeranges: Allow merge into existing branch in https://gerrit.libreoffice.org/6921 from Robinson Tryon + Bibisect: Add README with step-by-step documentation in https://gerrit.libreoffice.org/6922 from Robinson Tryon * 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-01-24
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + Fix FTBFS when TDE integration is enabled in https://gerrit.libreoffice.org/7626 from Timothy Pearson about module connectivity, include, vcl + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud about module include + fix for fdo#40694 -Error in message warning in https://gerrit.libreoffice.org/7618 from Ayantha Randika about module sc + Cleanup font mapping configure test in https://gerrit.libreoffice.org/7619 from Jan-Marek Glogowski about module build + fdo#72197 dirty hack to demonstrate a problem in https://gerrit.libreoffice.org/7615 from Winfried Donkers about module formula, sc + fdo#52461 Multiple instances of same cell now get same color. in https://gerrit.libreoffice.org/7514 from Rachit Gupta about module sc + Fix for: DOCX-Preservation of Line style Dash type of Shape with text in in https://gerrit.libreoffice.org/7611 from Pallavi Jadhav about module sw + Upgrade doxygen config file in https://gerrit.libreoffice.org/7610 from Chris Sherlock about module solenv + fdo#69656 table with auto-width and at least one column with auto-width. in https://gerrit.libreoffice.org/7593 from Sushil Shinde about module offapi, sw, writerfilter + fdo#69646 Export of table with auto-width, at least one column with auto- in https://gerrit.libreoffice.org/7594 from Sushil Shinde about module sw + Introduce com.sun.star.task.theJobExecutor singleton. in https://gerrit.libreoffice.org/7609 from Matúš Kukan about module dbaccess, desktop, framework, offapi, reportdesign, scripting, sfx2 + fdo#72563 : PAGEREF field tag not preserved during Roundtrip in https://gerrit.libreoffice.org/7605 from Tushar Bende about module sw End of freshness * Merged changes on master for project core changed in the last 25 hours: + Depend unit test on existing font. in https://gerrit.libreoffice.org/7596 from Jan-Marek Glogowski + related: fdo#73682 Introduce HTML detection service in https://gerrit.libreoffice.org/7600 from Maxim Monastirsky + Remove unnecessary verbiage. in https://gerrit.libreoffice.org/7608 from Chris Sherlock + fdo#73546 : faulty value of attribute value in wp:anchor tag in https://gerrit.libreoffice.org/7501 from Umesh Kadam + fdo#63154 Removed unused solar.h reference in https://gerrit.libreoffice.org/7604 from Alexandre Vicenzi + Move defines into settings.hxx in https://gerrit.libreoffice.org/7585 from Chris Sherlock + Document more of VCL's Application class in https://gerrit.libreoffice.org/7588 from Chris Sherlock * Abandoned changes on master for project core changed in the last 25 hours: + Change Application::SystemSettingsChanging to OverrideSystemSettings in https://gerrit.libreoffice.org/7602 from Chris Sherlock + DataChanged should call on NotifyAllWindows in https://gerrit.libreoffice.org/7606 from Chris Sherlock + fdo#72563 : Pageref field tag not preserved in https://gerrit.libreoffice.org/7074 from Rajashri Udhoji + fdo#72989: Disable buttons when Goal Seek or Solver selected in https://gerrit.libreoffice.org/7584 from Dima Kostenich * Open changes needing tweaks, but being untouched for more than a week: + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + fdo#71788: Unit test case for corruption of file after roundtrip. in https://gerrit.libreoffice.org/6853 from Pallavi Jadhav + fdo#72804 Add firebird.msg to install. in https://gerrit.libreoffice.org/7254 from Andrzej Hunt + Export CoreText-related SPI stuff in https://gerrit.libreoffice.org/7143 from Douglas Mencken + fix previous commit in https://gerrit.libreoffice.org/7101 from Markus Mohrhard + CID#736173: Out-of-bound read in https://gerrit.libreoffice.org/6973 from Julien Nabet + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Increase number of remembered recent documents from 10 to 25 in
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fffacd58d84225650edfbe17211ca4bbf6f1997a
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 24 08:36:34 2014 +0100
bool improvements
Change-Id: I20fbe8d5b25460959d4192f18431a585dbfb260f
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index e67c122..6851033 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -3172,7 +3172,7 @@ void SbaTableQueryBrowser::impl_initialize()
// are we loaded into a (sub)frame of an embedded document (i.e. a form
belonging to a database
// document)?
-sal_Bool bSubFrameOfEmbeddedDocument = sal_False;
+bool bSubFrameOfEmbeddedDocument = false;
if ( xFrame.is() )
{
ReferenceXFramesSupplier xSup = xFrame-getCreator();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] New run ready for RC3
Hi Sophie sophi wrote In fact, that actually has no incidence because there is no localization of the tests or of the MozTrap interface available. I should better remove the languages in the list than add some, that would be less confusing. When we will have a translation and a way to handle the translated tests, all the LO language will be added :) But maybe there are some specific problems with Asiatic or East European characters and/or RTL languages (e.g. arabic) that should have separate cases? Some comments: Test number 6 should be moved up to number 2; there is a typo in the name of Test number 18 in English Create a new Math do_c_ument Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-New-run-ready-for-RC3-tp4093033p4093610.html Sent from the QA mailing list archive at Nabble.com. ___ 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] New run ready for RC3
Hi Pedro, Le 23/01/2014 09:55, Pedro a écrit : Hi Sophie sophi wrote In fact, that actually has no incidence because there is no localization of the tests or of the MozTrap interface available. I should better remove the languages in the list than add some, that would be less confusing. When we will have a translation and a way to handle the translated tests, all the LO language will be added :) But maybe there are some specific problems with Asiatic or East European characters and/or RTL languages (e.g. arabic) that should have separate cases? Yes, of course, but I guess the tester knows that and if there is a bug he will be able to add the language information to the description of the problem. I mean the language info doesn't appear in the test results. Some comments: Test number 6 should be moved up to number 2; not sure I can order the tests differently, but lets try :) there is a typo in the name of Test number 18 in English Create a new Math do_c_ument Thanks, I'll correct it asap. Cheers Sophie ___ 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] New run ready for RC3
Hi again Sophie sophi wrote But maybe there are some specific problems with Asiatic or East European characters and/or RTL languages (e.g. arabic) that should have separate cases? Yes, of course, but I guess the tester knows that and if there is a bug he will be able to add the language information to the description of the problem. I mean the language info doesn't appear in the test results. Yes, that is true. Then removing the languages would be good. This would reduce combinations from 81 to 9 :) Currently because of all the combinations (3 Archs, 9 Locales and 4 Platforms) it seems that testing is very inconclusive. Most tests show 2% completion except for 4.2.0 beta2 which was EN_US only (23%)... Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-New-run-ready-for-RC3-tp4093033p4093620.html Sent from the QA mailing list archive at Nabble.com. ___ 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] MABs and priority (was: minutes of ESC call ...)
On Tue, Jan 21, 2014 at 8:00 AM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hi, So to ease this work, I created two stored queries: https://bugs.freedesktop.org/buglist.cgi?cmdtype=runnamednamedcmd=mab-not-highest https://bugs.freedesktop.org/buglist.cgi?cmdtype=runnamednamedcmd=highest-not-mab Bjoern - I'm getting an error when I try to run the stored query: The search named mab-not-highest does not exist. Are these searches perhaps being stored on a per-user basis? --R ___ 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] MABs and priority (was: minutes of ESC call ...)
On Thu, Jan 23, 2014 at 07:21:11AM -0800, Robinson Tryon wrote: On Tue, Jan 21, 2014 at 8:00 AM, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Hi, So to ease this work, I created two stored queries: https://bugs.freedesktop.org/buglist.cgi?cmdtype=runnamednamedcmd=mab-not-highest https://bugs.freedesktop.org/buglist.cgi?cmdtype=runnamednamedcmd=highest-not-mab Bjoern - I'm getting an error when I try to run the stored query: The search named mab-not-highest does not exist. ... or something. As hinted by Michael, I just used a link shortener: + mab-not-highest : http://goo.gl/pyrYpO + highest-not-mab : http://goo.gl/K00Pmr Best, Bjoern ___ 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] MABs and priority
Robinson Tryon wrote (23-01-14 16:21) Are these searches perhaps being stored on a per-user basis? Yes. And the user can mark them to be public available under freedesktop preferences ;) -- Cor Nouws - vrijwilliger http://nl.libreoffice.org - The Document Foundation Membership Committee Member signature.asc Description: OpenPGP digital signature ___ 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.2.0 RC3 available
Dear Community, The Document Foundation is pleased to announce the third release candidate of LibreOffice 4.2.0. The upcoming 4.2.0 will bring new features and lots of bugfixes. Check out https://wiki.documentfoundation.org/ReleaseNotes/4.2 for an (incomplete and work-in-progress) list of the new features. Please be aware that LibreOffice 4.2.0 RC3 is not been flagged as ready for production use yet, you should continue to use LibreOffice 4.1.4 for that. 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/ LibreOffice 4.2.0 RC3 is also available in a 64bit version for Mac OS X 10.8 (or newer) Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details). Beginning with RC2, the debug symbols are also source-indexed. 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/get-involved/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.2.0 RC3 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.0/RC3 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-qa] QA EasyHack: Summarize bug comments (fdo#73993)
Hi, as a result of a rather casual discussion on #libreoffice-dev (originally along the lines of we should autoclose all bugs with more than 42 comments, one cannot possibly make sense of that with all the noise), I created: https://bugs.freedesktop.org/show_bug.cgi?id=73993 which might seriously help developers get an idea of what a bug is about, even when it has many comments. Hoping for some volunteers there -- it might also be a good way to onboard or mentor newcomers! ;) Best, Bjoern ___ 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 73960] Draw doesn't save additional Glue Points
https://bugs.freedesktop.org/show_bug.cgi?id=73960 wabik wa...@wp.pl changed: What|Removed |Added Hardware|x86-64 (AMD64) |x86 (IA32) -- 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
