[Libreoffice-commits] core.git: cui/source svx/inc svx/source
cui/source/options/optdict.cxx |5 ++---
svx/inc/svx/langbox.hxx |2 +-
svx/source/dialog/_contdlg.cxx |8
svx/source/dialog/contimp.hxx|6 +++---
svx/source/dialog/fntctrl.cxx| 12 ++--
svx/source/dialog/graphctl.cxx | 10 +-
svx/source/dialog/hdft.cxx |2 +-
svx/source/dialog/imapdlg.cxx|2 +-
svx/source/dialog/langbox.cxx| 12 ++--
svx/source/dialog/measctrl.cxx |4 ++--
svx/source/dialog/pagectrl.cxx | 16
svx/source/dialog/passwd.cxx |6 +++---
svx/source/dialog/pfiledlg.cxx |2 +-
svx/source/dialog/rubydialog.cxx | 20 ++--
svx/source/dialog/rulritem.cxx |8
15 files changed, 57 insertions(+), 58 deletions(-)
New commits:
commit a9bc164accdccc0f0ee074ded9b3559a52d5300b
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Mar 19 14:11:15 2013 +0900
sal_Bool to bool
Change-Id: I0a8d0f11c45aba1d34a0098e6a371bd616b08b72
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f87619e..33534bc 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -276,8 +276,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
Reference XDictionary xDic( pDic[i], UNO_QUERY );
if (xDic.is())
{
-sal_Bool bNegative = xDic-getDictionaryType() ==
DictionaryType_NEGATIVE ?
-sal_True : sal_False;
+bool bNegative = xDic-getDictionaryType() ==
DictionaryType_NEGATIVE;
String aDicName( xDic-getName() );
const String aTxt( ::GetDicInfoStr( aDicName,
LanguageTag( xDic-getLocale() ).getLanguageType(),
bNegative ) );
@@ -455,7 +454,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
if ( aBox.Execute() == RET_YES )
{
xDic-setLocale( LanguageTag( nLang ).getLocale() );
-sal_Bool bNegativ = xDic-getDictionaryType() ==
DictionaryType_NEGATIVE;
+bool bNegativ = xDic-getDictionaryType() ==
DictionaryType_NEGATIVE;
const String sName(
::GetDicInfoStr( xDic-getName(),
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 723914c..106af28 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -47,7 +47,7 @@ class SvtLanguageTable;
// load language strings from resource
-SVX_DLLPUBLIC StringGetDicInfoStr( const String rName, const sal_uInt16
nLang, sal_Bool bNeg );
+SVX_DLLPUBLIC StringGetDicInfoStr( const String rName, const sal_uInt16
nLang, bool bNeg );
class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
{
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 3795b83..fcccacb 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -191,7 +191,7 @@ sal_Bool SvxContourDlg::IsGraphicChanged() const
PolyPolygon SvxContourDlg::GetPolyPolygon()
{
-return pSuperClass-GetPolyPolygon( sal_True );
+return pSuperClass-GetPolyPolygon( true );
}
const void* SvxContourDlg::GetEditingObject() const
@@ -362,7 +362,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon
rPolyPoly )
aContourWnd.GetSdrModel()-SetChanged( sal_True );
}
-PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic )
+PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
{
PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() );
@@ -407,12 +407,12 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic
rGraphic, sal_Bool _bGrap
aUpdateTimer.Start();
}
-sal_Bool SvxSuperContourDlg::IsUndoPossible() const
+bool SvxSuperContourDlg::IsUndoPossible() const
{
return aUndoGraphic.GetType() != GRAPHIC_NONE;
}
-sal_Bool SvxSuperContourDlg::IsRedoPossible() const
+bool SvxSuperContourDlg::IsRedoPossible() const
{
return aRedoGraphic.GetType() != GRAPHIC_NONE;
}
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index d328c1e..d15e380 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -79,13 +79,13 @@ public:
sal_BoolIsGraphicChanged() const { return nGrfChanged
0UL; }
voidSetPolyPolygon( const PolyPolygon rPolyPoly );
-PolyPolygon GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True
);
+PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true );
voidSetEditingObject( void* pObj ) { pCheckObj = pObj; }
const void* GetEditingObject() const { return pCheckObj; }
-sal_BoolIsUndoPossible() const;
-sal_BoolIsRedoPossible() const;
+boolIsUndoPossible() const;
+boolIsRedoPossible() const;
voidUpdateGraphic( const Graphic rGraphic, sal_Bool
[Libreoffice-commits] core.git: writerperfect/source
writerperfect/source/draw/CDRImportFilter.cxx |5 -- writerperfect/source/draw/CDRImportFilter.hxx | 16 writerperfect/source/draw/CMXImportFilter.cxx |4 -- writerperfect/source/draw/CMXImportFilter.hxx | 16 writerperfect/source/draw/MSPUBImportFilter.cxx |4 -- writerperfect/source/draw/MSPUBImportFilter.hxx | 16 writerperfect/source/draw/VisioImportFilter.cxx |4 -- writerperfect/source/draw/VisioImportFilter.hxx | 16 writerperfect/source/draw/WPGImportFilter.cxx |3 - writerperfect/source/draw/WPGImportFilter.hxx | 16 writerperfect/source/filter/DocumentHandler.cxx |3 - writerperfect/source/stream/WPXSvStream.cxx |6 +-- writerperfect/source/writer/MSWorksImportFilter.cxx |6 --- writerperfect/source/writer/MSWorksImportFilter.hxx | 16 writerperfect/source/writer/MWAWImportFilter.cxx|6 --- writerperfect/source/writer/MWAWImportFilter.hxx| 16 writerperfect/source/writer/WordPerfectImportFilter.cxx |3 - writerperfect/source/writer/WordPerfectImportFilter.hxx | 32 18 files changed, 82 insertions(+), 106 deletions(-) New commits: commit 3dfff2ea4678105a186ce9ca4a038458a57c727e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Tue Mar 19 09:54:00 2013 +0100 ::rtl::OUString - OUString in writerperfect Change-Id: I2d0f8868779e5ac4a802f3f061704d2de5826c5d diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index ba2d19d..1a66c98 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -38,9 +38,6 @@ using com::sun::star::uno::Reference; using com::sun::star::io::XInputStream; using com::sun::star::io::XSeekable; using com::sun::star::uno::Sequence; -using namespace ::rtl; -using rtl::OString; -using rtl::OUString; using com::sun::star::uno::Any; using com::sun::star::uno::UNO_QUERY; using com::sun::star::uno::XInterface; @@ -134,7 +131,7 @@ throw( com::sun::star::uno::RuntimeException ) } if (!xInputStream.is()) -return ::rtl::OUString(); +return OUString(); WPXSvInputStream input( xInputStream ); diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx index 95189e8..efdfae8 100644 --- a/writerperfect/source/draw/CDRImportFilter.hxx +++ b/writerperfect/source/draw/CDRImportFilter.hxx @@ -38,7 +38,7 @@ protected: // oo.org declares ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext mxContext; ::com::sun::star::uno::Reference ::com::sun::star::lang::XComponent mxDoc; -::rtl::OUString msFilterName; +OUString msFilterName; ::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XDocumentHandler mxHandler; public: @@ -57,7 +57,7 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); //XExtendedFilterDetection -virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence com::sun::star::beans::PropertyValue Descriptor ) +virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence com::sun::star::beans::PropertyValue Descriptor ) throw( com::sun::star::uno::RuntimeException ); // XInitialization @@ -65,22 +65,22 @@ public: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo -virtual ::rtl::OUString SAL_CALL getImplementationName( ) +virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); -virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString ServiceName ) +virtual sal_Bool SAL_CALL supportsService( const OUString ServiceName ) throw (::com::sun::star::uno::RuntimeException); -virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames( ) +virtual ::com::sun::star::uno::Sequence OUString SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString CDRImportFilter_getImplementationName() +OUString CDRImportFilter_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL CDRImportFilter_supportsService( const ::rtl::OUString ServiceName ) +sal_Bool SAL_CALL CDRImportFilter_supportsService( const OUString ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL CDRImportFilter_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence OUString SAL_CALL CDRImportFilter_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference
[PUSHED] automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2832 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: #ifdef vs #if for feature checks
On 19.03.2013 00:02, Norbert Thiebaud wrote: On Mon, Mar 18, 2013 at 11:17 AM, Lubos Lunak l.lu...@suse.cz wrote: On Monday 18 of March 2013, Tor Lillqvist wrote: Sounds great to me too; though of course I'd prefer to keep the diff smaller and not replace all the header guards: #ifndef INCLUDED_OOXML_FAST_CONTEXT_HANDLER_HXX #define INCLUDED_OOXML_FAST_CONTEXT_HANDLER_HXX ... Oh the other hand, it would be nice if the header guards were consistently named... and didn't start with an underscore (such identifiers are supposed to be reserved for the language and/or OS implementation, unless I am mistaken). Somebody just needs to come up with a consistent naming style and do it (with some nice script). (The style of above example would be fine with me.) Yes, a script should be enough for this. And yes, somebody just needs to do it :). otoh, #pragma once is supported by all the compiler we use isn't it ? so if we are going to change it, why not use that instead. There are some discussions about that on the Internet. Most interesting: Some kind of benchmark comparison at http://tinodidriksen.com/2011/08/31/cpp-include-speed/ Looks like header guards as we have them are the best solution on gcc, but the worst for MSVC and no combination would be acceptable compared to 'plain' header guard with gcc. Thomas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re: #ifdef vs #if for feature checks
HI, I found some wiki about #pragma once compiler support http://en.wikipedia.org/wiki/Pragma_once#Portability http://en.wikipedia.org/wiki/Pragma_once#Portability Compiler#pragma once ClangSupported[7] Comeau C/C++Supported[8] Digital Mars C++Supported[9] GCCSupported[10] Intel C++ CompilerSupported[11] Microsoft Visual C++Supported[12] C++Builder XE3Supported[13] http://stackoverflow.com/questions/10990488/how-to-include-header-files-more-clearly-in-c/10990521#10990521 Thanks, vincent From: Tor Lillqvist Date: 2013-03-19 13:51 To: Norbert Thiebaud CC: libreoffice; Lubos Lunak Subject: Re: #ifdef vs #if for feature checks otoh, #pragma once is supported by all the compiler we use isn't it ? Excellent! Let's do that, unless somebody comes up with a counter-argument in a week or so. --tml ___ 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
Re: [RFC] add --pidfile switch to write libo pid to a file
Hi Stephan, Il 18/03/2013 22:18, Stephan Bergmann ha scritto: On 03/16/2013 07:55 PM, Riccardo Magliocchetti wrote: attached a patch to add a switch to have libreoffice store its pid in a file. I need that so that when libo runs in headless mode i can have a supervisor process checking if libo is running and in case just restart it. The error handling is a bit lame, do we have an helper to create a file with its content with one function call somewhere? that could help cleaning the pidfile creation code a bit i think. I'm not sure how exactly you would want to use this (e.g., given that there's only code to create the pid file, but none to clear it again), but have a few points: * If you have a supervisor process, why not let it keep track of the pid of any started LO process? Because it can track only one pid :) My plan is to use uwsgi [1] to manage libo instances by a feature called smart-attach-daemon [2] (not so robust atm btw) so i need to export the pid of the process i want to manage. The advantage of this is i can have the same stack running my python app (presumably a wrapper for unoconv [3]) keeping libreoffice running. I'm no root here so i can't exploit a modern init system. [uwsgi] master = true socket = :3031 #smart-attach-daemon = libo.pid /usr/local/lib/libreoffice/program/soffice '--accept=socket,host=localhost,port=2002;urp;' --pidfile=libo.pid attach-daemon = /usr/local/lib/libreoffice/program/soffice '--accept=socket,host=localhost,port=2002;urp;' The difference between the two is that with the smart one i can reload my app without restarting libreoffice. * The client-facing executable in LO is soffice (which on Linux is a shell script that execs into oosplash), which internally spawns soffice.bin processes. It would thus look more natural to be interested in pid files from the client-facing process rather than from soffice.bin processes (which your patch would implement). soffice.bin is the one i see in netstat so it looked the right one to me, but handling this from soffice would be lot more easier. * I would prefer if we could get away without exposing that OSL_DETAIL_GETPID hack in the stable URE interface. For example, its underspecified type is not a problem for the sole use case in sal/osl/all/log.cxx, but would not fit well into a well-crafted API. ok thanks, riccardo [1] http://projects.unbit.it/uwsgi/ [2] http://uwsgi.readthedocs.org/en/latest/AttachingDaemons.html [3] https://github.com/dagwieers/unoconv ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk
bridges/Library_cpp_uno.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c70aa412ede28cb0bb08a32a532c745a9d4a2266 Author: Tor Lillqvist t...@iki.fi Date: Tue Mar 19 11:07:43 2013 +0200 No -ldl for MinGW either Change-Id: I7e74559d2edd1adc9225a935735ba4f6fd7eea24 diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 6eefed6..5a7516f 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -202,7 +202,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ -mno-avx)) \ )) -ifneq ($(OS),ANDROID) +ifeq ($(filter ANDROID WNT,$(OS)),) $(eval $(call gb_Library_add_libs,gcc3_uno,\ -ldl \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] add --pidfile switch to write libo pid to a file
Hi Tor, Il 19/03/2013 07:08, Tor Lillqvist ha scritto: .It would thus look more natural to be interested in pid files from the client-facing process rather than from soffice.bin processes (which your patch would implement). Ah, but his very point is that he is working on the --enable-headless thing, where (if I understand correctly) there is no client-facing GUI at all (it is intended for servers that don't even have any X11 library packages installed I think), but soffice.bin functions as a GUI-less daemon type of program. I think he is referring to soffice as user facing program. Which is the one i am calling to start libreoffice. thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] QA Field in FDO - What's the Purpose (discussion)
Joel Madero píše v Po 18. 03. 2013 v 11:38 -0700: During our last QA call we had a continuing discussion about the QA field that Rainer began a few weeks back [1] Basically the conversation is what's the point of the QA field There are multiple opinions: 1. QA Field should represent exactly what Dev field represents, ie. QA contact is responsible for everything QA related, if further testing is asked for, bibisect etc...QA contact should do it I think that this is the intuitive explanation. 2. QA contact is just a way to signal QA has looked at this, priority has been set (most of the time) but there is no obligation for the QA contact to monitor bug further - usually they will as they are receiving emails and are familiar with the bug but other QA people are able to update and get further details to devs. IMHO, this is not intuitive. Also you would get too many mails from bugzilla. It would be hard to distinguish what need your reaction (bugtriaging) and what is related to the other stages (fixing). 3. QA contact is a combination of #1 and #2, they should do everything in their power to keep up with the bug and if they are unable to provide something, should find someone who can. I am afraid that it would not work as it did not work with developers. Some persons might be overhelmed. It does not solve the problem when a person stops contributing at all. I personally would be afraid to become fully responsible for more than 200[*] bugs because then I would not be able to react on time, get stressed, and disappointed with that job. [*]The number depends on how much time you have to spend with the project, how much you are perfectionist, etc. I would suggest to keep the two things separated and use something else to mark prioritized bugs, for example whiteboard status. We might get rid of the whiteboard status in the long run, when people get used to prioritization and most confirmed bugs have reasonable priority and severity. We need not think about perfect solution here. Bugzilla newer will be 100% prioritized. Some users will change it even for already prioritized bugs. Even bug triagers need not be objective because it is often not easy to know how many users are affected and what are all side effects. I think that prioritization is worth the effort but we should not be too strict about it. Otherwise, we spend more time fighting about priorities than with solving the bugs :-) Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: I am Vincent, I am glad to join libreoffice gsoc
On Tue, 2013-03-19 at 12:43 +0800, vincent wrote: Can someone share with me who will be the mentor of the topic: Implement a about:config functionality The possible mentors are indicated in the task description on the wiki page. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sfx2/inc sfx2/source
sfx2/inc/templatedlg.hxx|1 -
sfx2/source/doc/templatedlg.cxx | 15 +--
sfx2/source/doc/templatedlg.src |6 --
3 files changed, 5 insertions(+), 17 deletions(-)
New commits:
commit eff94128b8434501a6f9c26a5a47cfd7d408f472
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Mar 19 10:13:16 2013 +0100
Template Manager: fixed TabStops for the toolbars
Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 6b2d4bc..0a6be50 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -130,7 +130,6 @@ private:
TabControl maTabControl;
TabPage maTabPage;
-Control *mpToolbars;
Edit *mpSearchEdit;
ToolBox *mpViewBar;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 54bfdbc..6a828ce 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -114,11 +114,10 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
: ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
maTabControl(this,SfxResId(TAB_CONTROL)),
maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)),
- mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))),
mpSearchEdit(new Edit(maTabPage,WB_HIDE | WB_BORDER)),
- mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
- mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
- mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
+ mpViewBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_VIEW))),
+ mpActionBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_ACTION))),
+ mpTemplateBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_TEMPLATES))),
mpSearchView(new TemplateSearchView(maTabPage)),
maView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
mpOnlineView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
@@ -240,7 +239,6 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
delete mpTemplateDefaultMenu;
delete mpActionMenu;
delete mpRepositoryMenu;
-delete mpToolbars;
}
void SfxTemplateManagerDlg::setSaveMode(bool bMode)
@@ -319,9 +317,6 @@ void SfxTemplateManagerDlg::Resize()
long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(),
aActionSize.getHeight()), aTemplateSize.getHeight());
-Size aToolbarsSize (aWinSize.getWidth(), nToolbarsHeight);
-mpToolbars-SetSizePixel(aToolbarsSize);
-
aActionSize.setWidth(3*aActionSize.getWidth());
aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar-GetPosPixel().X());
aTemplateSize.setWidth(aWinSize.getWidth());
@@ -335,7 +330,7 @@ void SfxTemplateManagerDlg::Resize()
// Set view position below toolbox
Point aViewPos = maView-GetPosPixel();
-aViewPos.setY(aToolbarsSize.getHeight());
+aViewPos.setY(nToolbarsHeight);
aViewPos.setX(0);
Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY());
maView-SetPosSizePixel(aViewPos, aThumbSize);
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 3de2c42..1761118 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -112,12 +112,6 @@ TabPage TAB_TEMPLATE_MANAGER
Size = MAP_APPFONT( 290, 220 );
Hide = TRUE;
-Control TOOLBARS
-{
-Size = MAP_APPFONT( 290 , 20 );
-TabStop = False;
-};
-
Control TEMPLATE_VIEW
{
Pos = MAP_APPFONT( 0, 20 );
commit b6ba04639b9922f6717f79ac4be215e09691d7a9
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Mar 19 09:53:43 2013 +0100
Template Manager: fixed search edit field position
Change-Id: Ic5ef64ba3ed4c98397b0c4911de491df4c79946a
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index ce815bb..54bfdbc 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -115,7 +115,7 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
maTabControl(this,SfxResId(TAB_CONTROL)),
maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)),
mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))),
- mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)),
+ mpSearchEdit(new Edit(maTabPage,WB_HIDE | WB_BORDER)),
mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] add --pidfile switch to write libo pid to a file
On 03/19/2013 07:08 AM, Tor Lillqvist wrote: .It would thus look more natural to be interested in pid files from the client-facing process rather than from soffice.bin processes (which your patch would implement). Ah, but his very point is that he is working on the --enable-headless thing, where (if I understand correctly) there is no client-facing GUI at all (it is intended for servers that don't even have any X11 library packages installed I think), but soffice.bin functions as a GUI-less daemon type of program. And I'm not speaking about GUI at all. The client-facing executable to start is soffice, not soffice.bin, regardless of headless or no. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] unit test for fdo#60915
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2784 -- To view, visit https://gerrit.libreoffice.org/2784 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7c1e87521fbbfd76b8eeead17c58915c5d71728 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Korrawit Pruegsanusak detective.conan.1...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - filter/source svl/qa
filter/source/config/fragments/types/writer_MacWrite.xcu |2
svl/qa/unit/svl.cxx | 61 +++
2 files changed, 62 insertions(+), 1 deletion(-)
New commits:
commit 905db14dbc029519e674147e6a5a6f76fb81309e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Mar 19 10:23:35 2013 +0100
Typo
Change-Id: I436be96082fee3a65610f8100279c0abd09603bf
diff --git a/filter/source/config/fragments/types/writer_MacWrite.xcu
b/filter/source/config/fragments/types/writer_MacWrite.xcu
index 8abbf16..fa1882b 100644
--- a/filter/source/config/fragments/types/writer_MacWrite.xcu
+++ b/filter/source/config/fragments/types/writer_MacWrite.xcu
@@ -18,7 +18,7 @@
node oor:name=writer_MacWrite oor:op=replace
prop
oor:name=DetectServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop
prop oor:name=URLPattern/
-prop oor:name=Extensionsvalue/valuemw mcw/prop
+prop oor:name=Extensionsvaluemw mcw/value/prop
prop oor:name=MediaTypevalueapplication/macwrite/value/prop
prop oor:name=Preferredvaluetrue/value/prop
prop oor:name=PreferredFiltervalueMacWrite/value/prop
commit 0c4a20ad9ce9b3b9db8f4ad458bd742f84e1b903
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Mar 17 16:03:48 2013 +0700
unit test for fdo#60915
Change-Id: Ib7c1e87521fbbfd76b8eeead17c58915c5d71728
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 805992e..26a0b8d 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -86,13 +86,20 @@ public:
virtual void tearDown();
void testNumberFormat();
+void testFdo60915();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testNumberFormat);
+CPPUNIT_TEST(testFdo60915);
CPPUNIT_TEST_SUITE_END();
private:
uno::Reference uno::XComponentContext m_xContext;
+void checkPreviewString(SvNumberFormatter aFormatter,
+const OUString sCode,
+double fPreviewNumber,
+LanguageType eLang,
+OUString sExpected);
};
Test::Test()
@@ -300,6 +307,60 @@ void Test::testNumberFormat()
}
}
+void Test::checkPreviewString(SvNumberFormatter aFormatter,
+ const OUString sCode,
+ double fPreviewNumber,
+ LanguageType eLang,
+ OUString sExpected)
+{
+OUString sStr;
+Color* pColor = 0;
+Color** ppColor = pColor;
+if (!aFormatter.GetPreviewString(sCode, fPreviewNumber, sStr, ppColor,
eLang))
+CPPUNIT_FAIL(GetPreviewString() failed);
+CPPUNIT_ASSERT_EQUAL(sExpected, sStr);
+}
+
+void Test::testFdo60915()
+{
+LanguageType eLang = LANGUAGE_THAI;
+OUString sCode, sExpected;
+double fPreviewNumber = 1234; // equals 18/05/1903 (2446 B.E.)
+SvNumberFormatter aFormatter(m_xContext, eLang);
+{
+sCode = [~buddhist]D/MM/;
+sExpected = 18/05/2446;
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang,
sExpected);
+}
+{
+sCode = [~buddhist]D/MM/YY;
+sExpected = 18/05/46;
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang,
sExpected);
+}
+{
+sCode = [NatNum1][$-41E][~buddhist]D/MM/;
+sal_Unicode sTemp[] =
+{
+0x0E51, 0x0E58, 0x002F,
+0x0E50, 0x0E55, 0x002F,
+0x0E52, 0x0E54, 0x0E54, 0x0E56
+};
+sExpected = OUString(sTemp, SAL_N_ELEMENTS(sTemp));
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang,
sExpected);
+}
+{
+sCode = [NatNum1][$-41E][~buddhist]D/MM/YY;
+sal_Unicode sTemp[] =
+{
+0x0E51, 0x0E58, 0x002F,
+0x0E50, 0x0E55, 0x002F,
+0x0E54, 0x0E56
+};
+sExpected = OUString(sTemp, SAL_N_ELEMENTS(sTemp));
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang,
sExpected);
+}
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted ...
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello since you have - -aMap[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(YES)); - -aMap[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NO)); +aMap[0] = ::rtl::OUString(YES); +aMap[1] = ::rtl::OUString(NO); in the same way, you can push further - -aMap[0] = ::rtl::OUString(YES); - -aMap[1] = ::rtl::OUString(NO); +aMap[0] = YES; +aMap[1] = NO; and AFAIK, explicit OUString is necessary only with return and ? such as return OUString(bla bla bla); and aOUString = bCond ? OUString(String_true) : OUString(String_false); Olivier Em 19-03-2013 05:26, Thomas Arnhold (via Code Review) escreveu: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2832 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/2832/1 automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*[^)]*?\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec --- M bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_ios_arm/except.cxx M bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx M bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx M bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_arm/except.cxx M bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx M bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_intel/except.cxx M bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx M bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_mips/except.cxx M bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx M bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx M bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx M bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx M bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx M bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx M bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx M bridges/source/cpp_uno/mingw_intel/except.cxx M bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx M bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx M bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx M bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx M bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx M bridges/test/java_uno/acquire/testacquire.cxx M bridges/test/java_uno/equals/testequals.cxx M bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx M bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx M bridges/test/testclient.cxx M bridges/test/testcomp.cxx M bridges/test/testoffice.cxx M bridges/test/testsameprocess.cxx M bridges/test/testserver.cxx M configmgr/qa/unit/test.cxx M configmgr/source/access.cxx M configmgr/source/writemodfile.cxx M connectivity/source/commontools/ConnectionWrapper.cxx M connectivity/source/commontools/DateConversion.cxx M connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/ParamterSubstitution.cxx M
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||60769 -- 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 - compilerplugins/clang compilerplugins/Makefile-clang.mk
compilerplugins/Makefile-clang.mk|2
compilerplugins/clang/literalalternative.cxx | 111 +++
2 files changed, 112 insertions(+), 1 deletion(-)
New commits:
commit 24387f1c58b30cae26618c377acd95a336c28380
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 19 10:48:22 2013 +0100
A plugin to find suboptimal equalsIgnoreAsciiCaseAscii[L] calls
Change-Id: Id2572982ca899223b89016ee7482ccb960032805
diff --git a/compilerplugins/clang/literalalternative.cxx
b/compilerplugins/clang/literalalternative.cxx
new file mode 100644
index 000..e90b688
--- /dev/null
+++ b/compilerplugins/clang/literalalternative.cxx
@@ -0,0 +1,111 @@
+/* -*- 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 string
+
+#include plugin.hxx
+
+// Find those calls of rtl::OUString::equalsIgnoreAsciiCaseAscii and
+// rtl::OUString::equalsIgnoreAsciiCaseAsciiL that could be simplified to call
+// rtl::OUString::equalsIgnoreAsciiCase instead:
+
+namespace {
+
+class LiteralAlternative:
+public RecursiveASTVisitorLiteralAlternative, public loplugin::Plugin
+{
+public:
+explicit LiteralAlternative(ASTContext context): Plugin(context) {}
+
+virtual void run() { TraverseDecl(context.getTranslationUnitDecl()); }
+
+bool VisitCallExpr(CallExpr * expr);
+};
+
+bool LiteralAlternative::VisitCallExpr(CallExpr * expr) {
+if (ignoreLocation(expr)) {
+return true;
+}
+FunctionDecl const * fdecl = expr-getDirectCallee();
+if (fdecl == nullptr) {
+return true;
+}
+std::string qname { fdecl-getQualifiedNameAsString() };
+if (qname == rtl::OUString::equalsIgnoreAsciiCaseAscii
+ fdecl-getNumParams() == 1 expr-getNumArgs() == 1)
+{
+// equalsIgnoreAsciiCaseAscii(foo) - equalsIngoreAsciiCase(foo):
+StringLiteral const * lit
+= dyn_castStringLiteral(expr-getArg(0)-IgnoreParenImpCasts());
+if (lit != nullptr) {
+report(
+DiagnosticsEngine::Warning,
+(rewrite call of rtl::OUString::equalsIgnoreAsciiCaseAscii
+ with string literal argument as call of
+ rtl::OUString::equalsIgnoreAsciiCase),
+expr-getExprLoc());
+//TODO: a better loc (the equalsIgnoreAsciiCaseAscii part)?
+}
+return true;
+}
+if (qname == rtl::OUString::equalsIgnoreAsciiCaseAsciiL
+ fdecl-getNumParams() == 2 expr-getNumArgs() == 2)
+{
+// equalsIgnoreAsciiCaseAsciiL(foo, 3) -
equalsIngoreAsciiCase(foo)
+// especially also for
+// equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(foo)),
where
+// RTL_CONSTASCII_STRINGPARAM expands to complicated expressions
+// involving ((X)[0] sub-expressions (and it might or might not be
+// better to handle that at the level of non-expanded macros instead,
+// but I have not found out how to do that yet anyway):
+APSInt res;
+if (expr-getArg(1)-isIntegerConstantExpr(res, context)) {
+Expr const * arg0 = expr-getArg(0)-IgnoreParenImpCasts();
+StringLiteral const * lit = dyn_castStringLiteral(arg0);
+bool match = false;
+if (lit != nullptr) {
+match = res == lit-getLength();
+} else {
+UnaryOperator const * op = dyn_castUnaryOperator(arg0);
+if (op != nullptr op-getOpcode() == UO_AddrOf) {
+ArraySubscriptExpr const * subs
+= dyn_castArraySubscriptExpr(
+op-getSubExpr()-IgnoreParenImpCasts());
+if (subs != nullptr) {
+lit = dyn_castStringLiteral(
+subs-getBase()-IgnoreParenImpCasts());
+match = lit != nullptr
+ subs-getIdx()-isIntegerConstantExpr(
+res, context)
+ res == 0;
+}
+}
+}
+if (match) {
+report(
+DiagnosticsEngine::Warning,
+(rewrite call of
+ rtl::OUString::equalsIgnoreAsciiCaseAsciiL with string
+ literal and matching length arguments as call of
+ rtl::OUString::equalsIgnoreAsciiCase),
+expr-getExprLoc());
+//TODO: a better loc (the equalsIgnoreAsciiCaseAsciiL
+// part)?
+}
+}
+return true;
+}
+return true;
+}
+
Re: [PATCH] automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted ...
Hi Oliver, right. But I wanted to remove the macro only. There were 1663 cases like foo = [::rtl::]OUString(..) in the source before my commit. Now there are 2885. Huge increase, I know, but the other ones could be improved, too. Maybe with some script foo. Regardless how this is done it will be easier to review in comparison to removing the macro and the explicit OUString at once. Thomas On 19.03.2013 10:37, Olivier Hallot wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello since you have - -aMap[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(YES)); - -aMap[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(NO)); +aMap[0] = ::rtl::OUString(YES); +aMap[1] = ::rtl::OUString(NO); in the same way, you can push further - -aMap[0] = ::rtl::OUString(YES); - -aMap[1] = ::rtl::OUString(NO); +aMap[0] = YES; +aMap[1] = NO; and AFAIK, explicit OUString is necessary only with return and ? such as return OUString(bla bla bla); and aOUString = bCond ? OUString(String_true) : OUString(String_false); Olivier Em 19-03-2013 05:26, Thomas Arnhold (via Code Review) escreveu: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2832 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/2832/1 automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*[^)]*?\s*)\)\s*\)/OUString\($1\)/gms ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'libreoffice-3-6-6'
New branch 'libreoffice-3-6-6' available with the following commits: commit 7653fece0dce2df8b3d96bc39493cd4973d8d934 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 11:29:49 2013 +0100 Branch libreoffice-3-6-6 This is 'libreoffice-3-6-6' - the stable branch for the 3.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4d87f3c39c6b90a367248f168de3ce6a2f76a43b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-6-6'
New branch 'libreoffice-3-6-6' available with the following commits: commit d8abf43eff05c25563c77217987ec2d619037f51 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 11:29:50 2013 +0100 Branch libreoffice-3-6-6 This is 'libreoffice-3-6-6' - the stable branch for the 3.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ia46888773edaae4cb5f3884830c3c6471511e061 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-3-6-6'
New branch 'libreoffice-3-6-6' available with the following commits: commit 18ee39c1723abab8f35f9ab1664979c4382fb11e Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 11:29:50 2013 +0100 Branch libreoffice-3-6-6 This is 'libreoffice-3-6-6' - the stable branch for the 3.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ie79bbb78a6914a5ffa424eb83c05592b2d46a261 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-3-6-6'
New branch 'libreoffice-3-6-6' available with the following commits: commit 4342101a77d8c9191f08d617f2c4f54cd0ef903e Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 11:29:50 2013 +0100 Branch libreoffice-3-6-6 This is 'libreoffice-3-6-6' - the stable branch for the 3.6.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ib76569b8e662f47e7ded386aaffcae42d5fdef7b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/rtf/rtfitem.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f2cf65ec9a450441b92ed1f638eda26231a9be7 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Mar 17 18:13:17 2013 +0100 coverity#735374 Copy-paste error Change-Id: Icbd64c87f6a8fb87f4f2d82f23d3df613bbb6cfb Reviewed-on: https://gerrit.libreoffice.org/2798 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx index 19cc0b2..462e688 100644 --- a/editeng/source/rtf/rtfitem.cxx +++ b/editeng/source/rtf/rtfitem.cxx @@ -910,7 +910,7 @@ ATTR_SETOVERLINE: aOL = *(SvxOverlineItem*)pItem; } else -aOL = (const SvxOverlineItem)pSet-Get( PLAINID-nUnderline, sal_False ); +aOL = (const SvxOverlineItem)pSet-Get( PLAINID-nOverline, sal_False ); if( UNDERLINE_NONE == aOL.GetLineStyle() ) aOL.SetLineStyle( UNDERLINE_SINGLE ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |2 -
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit dd8a3795643e13633acb5309096b52f549bd7678
Author: Petr Mladek pmla...@suse.cz
Date: Tue Mar 19 11:33:29 2013 +0100
bump product version to 3.6.7.0+, reset number to 0
Change-Id: I89b26f414bb1f6c4355286864562a8edb95539a3
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 00c1876..3de6b07 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 3.6.6.0
+UREPACKAGEVERSION 3.6.7.0
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.6.0
+ABOUTBOXPRODUCTVERSION 3.6.7.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.7.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .7.0
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.6.0
+ABOUTBOXPRODUCTVERSION 3.6.7.0
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.7.0
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.7.0
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .7.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.7.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .7.0
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.7.0
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .7.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.7.0
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
[Libreoffice-commits] core.git: ucb/source
ucb/source/cacher/cachedcontentresultset.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c908d0431ee975c1ee7aa245af83b9eb7f95da6 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Mar 17 18:46:56 2013 +0100 coverity#982271 Copy-paste error Change-Id: I42800a846ba0cb935f97f8e99f774f58f3b525f8 Reviewed-on: https://gerrit.libreoffice.org/2802 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index e8adb8b..a9fcddb 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -503,7 +503,7 @@ CCRS_PropertySetInfo::CCRS_PropertySetInfo( rMyProp.Type = getCppuType( static_cast const sal_Bool * ( 0 ) ); rMyProp.Attributes = PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT; -if( nFetchSize != -1 ) +if( nFetchDirection != -1 ) m_nFetchDirectionPropertyHandle = (*pOrigProps)[nFetchDirection].Handle; else m_nFetchDirectionPropertyHandle = impl_getRemainedHandle(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] coverity#735374 Copy-paste error
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2798 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2798 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbd64c87f6a8fb87f4f2d82f23d3df613bbb6cfb Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#982271 Copy-paste error
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2802 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I42800a846ba0cb935f97f8e99f774f58f3b525f8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] add --pidfile switch to write libo pid to a file
Hi Riccardo, On Tue, 2013-03-19 at 10:06 +0100, Riccardo Magliocchetti wrote: soffice.bin is the one i see in netstat so it looked the right one to me, but handling this from soffice would be lot more easier. Right - that is doing all the work. Of course after the 'soffice' wrapper shell-script completes, it execve's 'oosplash' on linux - so that binary should inherit that pid. I think we can speculate as to the benefits of launching pagein/oosplash in the headless case; it would be reasonably reasonable to tweak: # run soffice.bin directly when you want to get the backtrace if [ -n $GDBTRACECHECK ] ; then exec $GDBTRACECHECK $sd_prog/soffice.bin $@ fi To check for the headless parameter and avoid oosplash entirely in this case I think; that would in turn ensure that the pid of the process you forked would be the real pid of the beast doing all the hard work [ and of course locking up from time to time - though we'd like to find/fix those lockups too naturally ;-]. Would that be a better solution ? ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2835 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2835/1 removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*[^)]*?\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b --- M bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx M bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx M bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx M bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx M bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx M bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx M bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx M bridges/test/java_uno/acquire/testacquire.cxx M bridges/test/java_uno/equals/testequals.cxx M bridges/test/performance/testperformance.cxx M bridges/test/testcomp.cxx M cli_ure/source/uno_bridge/cli_data.cxx M connectivity/source/commontools/AutoRetrievingBase.cxx M connectivity/source/commontools/ConnectionWrapper.cxx M connectivity/source/commontools/DateConversion.cxx M connectivity/source/commontools/DriversConfig.cxx M connectivity/source/commontools/FValue.cxx M connectivity/source/commontools/TColumnsHelper.cxx M connectivity/source/commontools/TIndexColumns.cxx M connectivity/source/commontools/TIndexes.cxx M connectivity/source/commontools/TTableHelper.cxx M connectivity/source/commontools/conncleanup.cxx M connectivity/source/commontools/dbconversion.cxx M connectivity/source/commontools/dbtools.cxx M connectivity/source/commontools/dbtools2.cxx M connectivity/source/commontools/parameters.cxx M connectivity/source/commontools/predicateinput.cxx M connectivity/source/commontools/sqlerror.cxx M connectivity/source/commontools/statementcomposer.cxx M connectivity/source/cpool/ZConnectionPool.cxx M connectivity/source/drivers/ado/AConnection.cxx M connectivity/source/drivers/ado/APreparedStatement.cxx M connectivity/source/drivers/ado/Awrapado.cxx M connectivity/source/drivers/hsqldb/HCatalog.cxx M connectivity/source/drivers/jdbc/JConnection.cxx M connectivity/source/drivers/mozab/MConfigAccess.cxx M connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx M connectivity/source/drivers/mysql/YCatalog.cxx M connectivity/source/drivers/postgresql/pq_connection.cxx M connectivity/source/drivers/postgresql/pq_driver.cxx M cppu/qa/test_any.cxx M cppu/source/threadpool/current.cxx M cppu/source/typelib/static_types.cxx M cppu/source/uno/cascade_mapping.cxx M cppuhelper/source/tdmgr.cxx M cppuhelper/test/cfg_test.cxx M cppuhelper/test/testcmp/TestComponent.cxx M cpputools/source/unoexe/unoexe.cxx M crashrep/source/win32/soreport.cxx M cui/source/dialogs/colorpicker.cxx M cui/source/dialogs/cuigaldlg.cxx M cui/source/dialogs/hlmarkwn.cxx M dbaccess/qa/extras/macros-test.cxx M dbaccess/source/ui/control/FieldDescControl.cxx M dbaccess/source/ui/dlg/CollectionView.cxx M dbaccess/source/ui/dlg/ConnectionHelper.cxx M dbaccess/source/ui/dlg/dbfindex.cxx M dbaccess/source/ui/dlg/odbcconfig.cxx M dbaccess/source/ui/dlg/queryfilter.cxx M dbaccess/source/ui/dlg/queryorder.cxx M dbaccess/source/ui/dlg/tablespage.cxx M dbaccess/source/ui/misc/DExport.cxx M dbaccess/source/ui/misc/UITools.cxx M dbaccess/source/ui/misc/WCPage.cxx M dbaccess/source/ui/misc/WCopyTable.cxx M dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx M dbaccess/source/ui/querydesign/QueryDesignView.cxx M dbaccess/source/ui/querydesign/querycontainerwindow.cxx M dbaccess/source/ui/tabledesign/TableController.cxx M dbaccess/source/ui/uno/ColumnPeer.cxx M drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx M drawinglayer/source/geometry/viewinformation2d.cxx M drawinglayer/source/geometry/viewinformation3d.cxx M editeng/source/items/flditem.cxx M editeng/source/misc/unolingu.cxx M editeng/source/uno/unotext.cxx M editeng/source/xml/xmltxtexp.cxx M editeng/source/xml/xmltxtimp.cxx M embeddedobj/source/commonembedding/persistence.cxx M
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-3.6.6.1'
Tag 'libreoffice-3.6.6.1' created by Petr Mladek pmla...@suse.cz at 2013-03-19 11:41 -0700 Tag libreoffice-3.6.6.1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRSEC/AAoJEPQ0oe+v7q6jUvAP/3LeBqsc5H3/9vp4TG1eNK75 eqgxbk+98PU1GMbSwCspv+h4dwZBYos3JWkMlgBql6Exxffg0eHIhGTs9n9TW4Pu Ae8rZJK/DlqVTEQvDI0RG5Wpp9KtAkn1rZHjfivH0PKTZspQbZITL8xj+S03YXys LBSfgTTVXo6NtwtKdJ3HsSaF8IOe/XsPlLLgdVyqcNh45BFpXos1wpER6K5lizk3 tZ+sKSUKYRS9rIJdWvCDUjjcwNIdmNwKqh1SkAhbapVLFU2fW/rCMdC8dZIvIapd JWSiw7teO3o1UYS/yYvhnRN9PSZXAMUg45sOod1z6BoNsr136nYtYz1iVdpXJOZG VHUxxa7dq+hcJXxhWhektus7g4+qstMATP4XsE71t4b2JXKe4UOHsWF+plZnWx93 bkNvyYESLGK1V9VdxlR+7cfXXH7NqkQR1oPtkrIpIOICKnlqN/TrFYZDe/LBwHMj W9I/qJqfZBT4qp5ZgKJ5eMtJ32BEf95eL3i+tY5+YDkHZIEocuLkGtQBaVtnPgFR awycNo7X1dK7orNHEYdmPGPTff1U56lzk5dbYzEs5JuaD1i8lQXw/Ew3S1+RKXpB dX6SUUxaEdCa3d1OtUwnhTFW7iVNqgl3uqdYNlQBg6R7PA2r5FyedLqtLimRA/Pm lc21EaSY8n6t/hdC60RG =nL5X -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-1081: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.6.1'
Tag 'libreoffice-3.6.6.1' created by Petr Mladek pmla...@suse.cz at 2013-03-19 11:41 -0700 Tag libreoffice-3.6.6.1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRSEC/AAoJEPQ0oe+v7q6j5zUP/jYLBju25L4KJF+cypLlbgC2 DrjqVF7E6u5nXlsGDqE68HTNTHecsa9lnddTi2QTiPO27nB0q8kWEpv0eurFPU2I wZspeDwbrdtK6fzP+LYRa6WzDRssf17SL8I8KY2PPTRZQTzrXwyHEujG3TQ/ffjB pVqfWfrPROJudjUq9fuSHfLYZ1j4kg/GHZhz48awwnX4Jz50Y8J7+n2mGiqDxNke 9lMysgvgyLNe2bBGc60BfQ97idbY3VGdotslxaMTNcT5w1a/DpxrUVbyp8mzGBUs FdXnMyW2BCR6HwlIhQhZTEhKCJfS4pFLcr8jFR8GU4I5ukTHGk8LeZl7+VNCKFu9 1uN7ufN92dCbP40wZNRJEHAsx2FGS1On2pVWW86AG9u3vFFgxs4T9OO8jW0k7U/C u+WJw44oaDjaEUXF0q2pm4YEz0h5qAylMpaHjTh0WxrfJ762x4+hMjm8evB0G3fT jC4rOSt01x9hPJz4xl2sB3DgsPWSDE10wbiuUrWpkIdcc1fqfuLTQjliAJB7wO5f 6msJ0pwuuzKWNdxqNQNI2rCWjTH1nxqREzag969pzPQeIe19MrwCb1e39twjNs/+ 6X+9LTaMMXbBC9n8+8867//x9Vu/igE41T0ppa6X+QT5Qw02wmyYQ7wrSOSAaZuf nUG+2T0orsJJSDSWTCbT =nvJv -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-3.6.6.1'
Tag 'libreoffice-3.6.6.1' created by Petr Mladek pmla...@suse.cz at 2013-03-19 11:41 -0700 Tag libreoffice-3.6.6.1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRSEDAAAoJEPQ0oe+v7q6jITsP/3/9EZnzU/Ca3mBHcj3oZcmh 1eB5RDgnHsRUwy2aGjlWDBH0RTgWNDYv1tAnHGp2VHYEwq/nZTWqc29vDMdXUMeV YNaP81kPIvLHCbyaccYIq3bsNN0Dxfu2UJpMf62RTYGYrNjqLKJ25DuEAN2LWZC4 tvPnATIQaWtHUjD56DjcZ+BexK7ZSAzgtQo6Vm/PEgUWDVto2sVtzKpoGbhUvuw+ kF93U7GIycpAlb62mCXIlLhbo/GEPFT61XaimCnhN0/8VI9ts4wcF51SU5ONsdji Ds3tbeQ7Or23MDkPTlDBJIqQtxDEYtRkmHG3IO+AQoaAoDzg9db6skQWzklMZmdS jwwLpwjLDHy+jxbrU029DDL/5TyPBaExS7OehSyJRbOmkRSpnxAwkJByVZoQR3I2 jIcB6ul2sJ5Va767S6y1yc0DnOLH2XPmSbvtSAc1YJrK1cNr+5FXV4aBOWNlZyBy 1bmpiDgqR55gXS/nb14fnqhEB6/xZmqQs7YB+g46T9vMFWpGKAKcyw4F/U2ShpXt 9O4nY93hfrGmGGOo24ZITB5aBgj5WBHtVMkPKEQSYg21ciMosdFTnOo1ezKN9hcg VISt3c3FLKy3cBpf2+wh1Zs09zNll+3hP+ux5jhp8KjKA7eOTRGxJpp0fN8ggQAA V+y7Ymy7Bm6JGr+X0sZA =N5pk -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-3.6.6.1'
Tag 'libreoffice-3.6.6.1' created by Petr Mladek pmla...@suse.cz at 2013-03-19 11:41 -0700 Tag libreoffice-3.6.6.1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRSEDAAAoJEPQ0oe+v7q6jXmcP/RDOD7tZmPEPYe55dLmlkxiq eT/AkW2sU8QjNa6t5QVZua9wn/CwPlizgCvee6xHDWJ4S2ONW84lq4uDeOvhI07O cZpMZDZmEINUo0xd9mbxzqhnqFg8tvkf6uOYndNdYLzBtSVgr36QlBbmeq61sNzz uS0afa39sWCQKVqSGEnUKkNunIcO0bpQe9v8rXDnTRn71yw1WQUtpjYsBNZYDD8u cUZlQIiBW8ia0Ds7PZy0BnhUAxU3QeKRceBXQAm9YzbF1/nEegQ0xg84GNqv7uSy 7x9WknDOlLw37uv9RoHFnQYtlF0kcnghr2SzOXJsRSkgQ/mBldxxWBklOwaiFifH Cb/P8npuju85Vpespukcx/LzPsExgCHK0hpum1XeXJ/uGJX8lLzysVB+De/AObd2 uxiOBH8weRE0b0voPnD6G8p58VyPqhyEDpcQSCnDWBx7/f0LfvQbQe0qflhFqeHo JIRHEkH4Fqsr8MT+gtTzA+vnrkFr8luLbqZBTMSYuPRHHd7CCACyyXsqqMa2gW8q KPSBRpWF95rp8StiktYKrdhVQ1a7lMV43x56rP5/va2kd9UOLGWHEzBHh8yjE1p0 Ix3vys7i9DGmVYHKxNBx9HFPXlKhSgCgF6ZLYzyN2GvzEHBxeylBHjzYSKhsXDmh U3ileC+XcnDncfDvpgH0 =PIXM -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-30: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-3.6.6.1'
Tag 'libreoffice-3.6.6.1' created by Petr Mladek pmla...@suse.cz at 2013-03-19 11:41 -0700 Tag libreoffice-3.6.6.1 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRSEDAAAoJEPQ0oe+v7q6jfP4P+wbM63OGVbOO8Xco5hk9aWwF YxSTBZNKkmSCHHRFSUx9LU44CbVhyjPjKYI0oSFaXzG6VuMwgDEYI7KxfwgiumrG PtS7Li56a4/t4Gwhx4W9D3tFw6gw0vvlF49l0Aknspmw7Yx5GkCVs6S1WXAD+47C XSUOS6GvckiNfeYRY9i/Hdk44g+fyambUsbvf9fa7QnfnTMEhPnjUvoRSKTtZywx zBwgnuMgi3g1vH0IIFFpe45pT1oUzKBJYG+nug1SO5LzEGqWM5IrfSxcFmKRxueV A5lwhSIyQN6rDGVNxvjXglNIWAuvFXqfTgnJEuLTY5oseSdc8vpUkmiTmJkK9FE2 Rw7lAb4iKjyPl3unhHMIhrI1pQbZzwtIo5h8LMvB0IcOggjKJEZadfrZopwx5QGU FvPoO70c7Gi0c8dnNIwtHRd3nNWxpX4k7RqALXheF8uTdsGq6z0QX4Ufl0iU2L2q d0KZ8JEe8WwrIe/fP/YZIjJ+zUp8SVMW6Ua2gL1Xac5fK8hVVTMlsZrGr0r+D1J1 tcZw8S6EtD9D5/YQbCrE2A+UCpF4uts1ad4rdmjomLZHr0ty70O+yfQdTrQJr4Nv 3KCSoUG6LZZZ3pGH3/21d+g5L24W0XBbyrtZjtQCTULwfLOgOXr08YYIVUR9+f/i GjeK2hwNk+mfqaPfy4RN =rofJ -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-34: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] add --pidfile switch to write libo pid to a file
On 03/19/2013 10:06 AM, Riccardo Magliocchetti wrote: Il 18/03/2013 22:18, Stephan Bergmann ha scritto: On 03/16/2013 07:55 PM, Riccardo Magliocchetti wrote: attached a patch to add a switch to have libreoffice store its pid in a file. I need that so that when libo runs in headless mode i can have a supervisor process checking if libo is running and in case just restart it. The error handling is a bit lame, do we have an helper to create a file with its content with one function call somewhere? that could help cleaning the pidfile creation code a bit i think. I'm not sure how exactly you would want to use this (e.g., given that there's only code to create the pid file, but none to clear it again), but have a few points: * If you have a supervisor process, why not let it keep track of the pid of any started LO process? Because it can track only one pid :) My plan is to use uwsgi [1] to manage libo instances by a feature called smart-attach-daemon [2] (not so robust atm btw) so i need to export the pid of the process i want to manage. The advantage of this is i can have the same stack running my python app (presumably a wrapper for unoconv [3]) keeping libreoffice running. I'm no root here so i can't exploit a modern init system. [uwsgi] master = true socket = :3031 #smart-attach-daemon = libo.pid /usr/local/lib/libreoffice/program/soffice '--accept=socket,host=localhost,port=2002;urp;' --pidfile=libo.pid attach-daemon = /usr/local/lib/libreoffice/program/soffice '--accept=socket,host=localhost,port=2002;urp;' The difference between the two is that with the smart one i can reload my app without restarting libreoffice. OK, I see. * The client-facing executable in LO is soffice (which on Linux is a shell script that execs into oosplash), which internally spawns soffice.bin processes. It would thus look more natural to be interested in pid files from the client-facing process rather than from soffice.bin processes (which your patch would implement). soffice.bin is the one i see in netstat so it looked the right one to me, but handling this from soffice would be lot more easier. Then again, soffice.bin is the process that actually listens on the --accept arguments, so in your use case it might be more appropriate to track the soffice.bin pid after all. Setting up the listeners for the --accept arguments passed from soffice/oosplash to soffice.bin is done in Desktop::RegisterServices (desktop/source/app/appinit.cxx), so that might also be a good place to write the pid. (Setting up listeners for additional --accept arguments passed from additional soffice/oosplash/soffice.bin processes that pass their arguments to the first soffice.bin process and then terminate again are handled in desktop/source/app/officeipcthread.cxx. Arguably, you would not want to handle --pidfile arguments passed in that way, and at least in theory this situation should not arise anyway with your setup.) Documentation about command line parameters is in desktop/source/app/cmdlinehelp.cxx, btw. * I would prefer if we could get away without exposing that OSL_DETAIL_GETPID hack in the stable URE interface. For example, its underspecified type is not a problem for the sole use case in sal/osl/all/log.cxx, but would not fit well into a well-crafted API. ok One cheap solution could be to duplicate the handful of relevant lines from sal/osl/all/log.cxx. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 60593, which changed state. Bug 60593 Summary: [Template manager] Creating new template directory is unnecessarily hard https://bugs.freedesktop.org/show_bug.cgi?id=60593 What|Removed |Added Status|NEW |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
[PUSHED] removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2835 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2835 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] add --pidfile switch to write libo pid to a file
On 03/19/2013 11:35 AM, Michael Meeks wrote: I think we can speculate as to the benefits of launching pagein/oosplash in the headless case; it would be reasonably reasonable to tweak: Note that oosplash also restarts soffice.bin in the scenario of first call to soffice for a given UserInstallation after LO installation or upgrade, and also runs javaldx---which unfortunately can still be relevant. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 92/68b63d40271adc1ebd719b694124e7a1c46988
92/68b63d40271adc1ebd719b694124e7a1c46988 |1 + 1 file changed, 1 insertion(+) New commits: commit da7a736d975f1392fabc81e8a190d9bccd2cb7f7 Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 19 10:52:29 2013 + Notes added by 'git notes add' diff --git a/92/68b63d40271adc1ebd719b694124e7a1c46988 b/92/68b63d40271adc1ebd719b694124e7a1c46988 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/92/68b63d40271adc1ebd719b694124e7a1c46988 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] add --pidfile switch to write libo pid to a file
Hi Michael, Il 19/03/2013 11:35, Michael Meeks ha scritto: Hi Riccardo, On Tue, 2013-03-19 at 10:06 +0100, Riccardo Magliocchetti wrote: soffice.bin is the one i see in netstat so it looked the right one to me, but handling this from soffice would be lot more easier. Right - that is doing all the work. Of course after the 'soffice' wrapper shell-script completes, it execve's 'oosplash' on linux - so that binary should inherit that pid. I think we can speculate as to the benefits of launching pagein/oosplash in the headless case; it would be reasonably reasonable to tweak: # run soffice.bin directly when you want to get the backtrace if [ -n $GDBTRACECHECK ] ; then exec $GDBTRACECHECK $sd_prog/soffice.bin $@ fi To check for the headless parameter and avoid oosplash entirely in this case I think; that would in turn ensure that the pid of the process you forked would be the real pid of the beast doing all the hard work [ and of course locking up from time to time - though we'd like to find/fix those lockups too naturally ;-]. Would that be a better solution ? We tried that but got reverted in: ad050e40f1eb05c49b116ec9d856142f8dc4f635 Discussion with Stephan here: http://lists.freedesktop.org/archives/libreoffice/2012-September/038146.html Not handling the special exit codes mentioned in http://lists.freedesktop.org/archives/libreoffice/2012-September/038195.html was the reason of the revert. thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/483a7b084404ed9df6525f09a3bb600a5859f8
9d/483a7b084404ed9df6525f09a3bb600a5859f8 |1 + 1 file changed, 1 insertion(+) New commits: commit 2e31c02693e3de343fad15e7359e7687aa306523 Author: Michael Meeks michael.me...@suse.com Date: Tue Mar 19 10:53:40 2013 + Notes added by 'git notes add' diff --git a/9d/483a7b084404ed9df6525f09a3bb600a5859f8 b/9d/483a7b084404ed9df6525f09a3bb600a5859f8 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/9d/483a7b084404ed9df6525f09a3bb600a5859f8 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/annotate.pl
scripts/annotate.pl | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 0dfe7ff61bdeceb8a266139d8908a62a57b96079
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 19 11:02:56 2013 +
another contiguity metric.
diff --git a/scripts/annotate.pl b/scripts/annotate.pl
index 2ac2d6c..8bcad14 100755
--- a/scripts/annotate.pl
+++ b/scripts/annotate.pl
@@ -102,7 +102,11 @@ sub dump_breakdown($)
my $annotated = 0;
my %frequency;
my $contiguous = 0;
+my $contiguous_limit = 0;
my $in_start_run = 1;
+my $in_start_limit_run = 1;
+my $in_start_limit_max = 5;
+my $in_start_limit = $in_start_limit_max;
for my $rev (reverse @{$revs}) {
if($rev-{note} ne ) {
my $stem = $rev-{note};
@@ -113,8 +117,14 @@ sub dump_breakdown($)
$frequency{$stem}++;
$annotated++;
$contiguous++ if ($in_start_run);
+ $contiguous_limit++ if ($in_start_limit_run);
} else {
$in_start_run = 0;
+ if ($in_start_limit 0) {
+ $in_start_limit--;
+ } else {
+ $in_start_limit_run = 0;
+ }
}
}
@@ -122,7 +132,8 @@ sub dump_breakdown($)
for my $stem (sort { $frequency{$b} = $frequency{$a} } keys %frequency) {
print $frequency{$stem}\t$stem\n;
}
-print contiguous annotations: $contiguous\n;
+print contiguous annotations: $contiguous - contiguous\n;
+print contiguous tolerating $in_start_limit_max missing:
$contiguous_limit\n;
}
sub sanity_check_revs($$)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/svdfppt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9988dfd934754a917086bc9423b6c5b16faea40a
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 17 18:19:01 2013 +0100
coverity#735375 Copy-paste error
Change-Id: Ib976de6a5a1c54fd80645b675b20186a4b9d6661
Reviewed-on: https://gerrit.libreoffice.org/2799
Reviewed-by: Joren De Cuyper joren.libreoff...@telenet.be
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index d4b16e3..db41aed 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5987,7 +5987,7 @@ sal_Bool PPTParagraphObj::GetAttrib( sal_uInt32 nAttr,
sal_uInt32 nRetValue, sa
case PPT_ParaAttr_DefaultTab :
{
nRetValue = rParaLevel.mnDefaultTab;
-if ( pParaLevel ( nRetValue != pParaLevel-mnBulletOfs ) )
+if ( pParaLevel ( nRetValue != pParaLevel-mnDefaultTab ) )
bIsHardAttribute = 1;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] coverity#735375 Copy-paste error
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2799 Approvals: Noel Power: Verified; Looks good to me, approved Joren De Cuyper: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/2799 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib976de6a5a1c54fd80645b675b20186a4b9d6661 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 60/6d879864a9450bc362f26ee007fd610b1cf135
60/6d879864a9450bc362f26ee007fd610b1cf135 |1 + 1 file changed, 1 insertion(+) New commits: commit f3edf2074dfc37146952a05f0ad8c82804acbb37 Author: Eike Rathke er...@redhat.com Date: Tue Mar 19 12:29:21 2013 +0100 Notes added by 'git notes add' diff --git a/60/6d879864a9450bc362f26ee007fd610b1cf135 b/60/6d879864a9450bc362f26ee007fd610b1cf135 new file mode 100644 index 000..f4ecd37 --- /dev/null +++ b/60/6d879864a9450bc362f26ee007fd610b1cf135 @@ -0,0 +1 @@ +prefer: b884c2e0185e24fc498827b3a53becea9e646b85 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove RTL_CONSTASCII_(U)STRINGPARAM in sw (2)
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2837
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/2837/1
Remove RTL_CONSTASCII_(U)STRINGPARAM in sw (2)
Change-Id: I5f84d997855321145179a9d6198a0d093dc62a95
---
M sw/source/core/crsr/bookmrk.cxx
M sw/source/core/crsr/crossrefbookmark.cxx
M sw/source/core/layout/dbg_lay.cxx
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index dde7b14..09f3438 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -162,12 +162,12 @@
OUString MarkBase::ToString( ) const
{
OUStringBuffer buf;
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(Mark: ( Name, [ Node1,
Index1 ] ): ( ));
-buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, [ ));
+buf.append(Mark: ( Name, [ Node1, Index1 ] ): ( );
+buf.append( m_aName ).append(, [ );
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ] )) );
+.append( ] ));
return buf.makeStringAndClear( );
}
@@ -307,18 +307,18 @@
OUString Fieldmark::ToString( ) const
{
OUStringBuffer buf;
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( ));
-buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
-buf.append( m_aFieldname ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, [
));
+buf.append(
+Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( );
+buf.append( m_aName ).append(, );
+buf.append( m_aFieldname ).append(, [ );
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ], [));
+.append( ], [);
buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ] ) ));
+.append( ] ) );
return buf.makeStringAndClear( );
}
@@ -388,18 +388,18 @@
OUString CheckboxFieldmark::toString( ) const
{
OUStringBuffer buf;
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (
));
-buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
-buf.append( GetFieldname() ).appendAscii(RTL_CONSTASCII_STRINGPARAM(,
[ ));
+buf.append(
+CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (
);
+buf.append( m_aName ).append(, );
+buf.append( GetFieldname() ).append(, [ );
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ], [));
+.append( ], [);
buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ] ) ));
+.append( ] ) );
return buf.makeStringAndClear( );
}
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx
b/sw/source/core/crsr/crossrefbookmark.cxx
index 88452bf..0e8a08d 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -72,7 +72,7 @@
bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString rName)
{
-return
rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefHeadingBookmark_NamePrefix));
+return rName.match(CrossRefHeadingBookmark_NamePrefix);
}
const char CrossRefNumItemBookmark_NamePrefix[] = __RefNumPara__;
@@ -86,7 +86,7 @@
bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString rName)
{
-return
rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefNumItemBookmark_NamePrefix));
+return rName.match(CrossRefNumItemBookmark_NamePrefix);
}
}}
diff --git a/sw/source/core/layout/dbg_lay.cxx
b/sw/source/core/layout/dbg_lay.cxx
index 44e9ffc..9f383dc 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 25 -
sc/source/core/data/cell2.cxx |7 +++
sc/source/core/tool/token.cxx | 11 ---
3 files changed, 23 insertions(+), 20 deletions(-)
New commits:
commit 03fccc665131ba60bd6f757043e9da62417a50b7
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 19 11:52:14 2013 +
use cell hashing algorithm for computing groups.
Update unit tests, dumb-down hashing to compare more for similiarity
rather than identicality - we want to use this down columns.
Change-Id: Icea731daeb301e1febb2df48b6b46c9faba74e9d
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 63b740b..81fa1ea 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1222,6 +1222,13 @@ void Test::testFormulaHashAndTag()
{ =X20, =X$20, false }, // absolute vs relative
{ =X20, =$X20, false }, // absolute vs relative
{ =X$20, =$X20, false }, // column absolute vs row absolute
+// similar enough for merging ...
+{ =A1, =B1, true },
+{ =$A$1, =$B$1, true },
+{ =A1, =C2, true },
+{ =SUM(A1), =SUM(B1), true },
+{ =A1+3, =B1+3, true },
+{ =A1+7, =B1+42, false },
};
for (size_t i = 0; i SAL_N_ELEMENTS(aHashTests); ++i)
@@ -6221,14 +6228,14 @@ void Test::testFormulaGrouping()
const char *pFormula[3];
const bool bGroup[3];
} aGroupTests[] = {
-{ { =B1, =C1, }, // single increments
- { true, true,false } },
-{ { =B1, =D1, =F1 }, // tripple increments
- { true, true,true } },
-{ { =B1, , =C1 }, // a gap
- { false, false, false } },
-{ { =B1, =C1+3, =C1+D1 }, // confusion: FIXME: =C1+7
- { false, false, false } },
+{ { =SUM(B1), =SUM(C1), },// single increments
+ { true,true, false } },
+{ { =SUM(B1), =SUM(D1),=SUM(F1) },// tripple increments
+ { true,true, true } },
+{ { =SUM(B1), ,=SUM(C1) },// a gap
+ { false, false, false } },
+{ { =SUM(B1), =SUM(C1;3), =SUM(D1;3) }, // similar foo
+ { false, true, true } },
};
m_pDoc-InsertTab( 0, sheet );
@@ -6259,7 +6266,7 @@ void Test::testFormulaGrouping()
if( !!pCur-GetCellGroup().get() ^ aGroupTests[i].bGroup[j] )
{
printf(expected group test %d at row %d to be %d but is %d\n,
- i, j, !!pCur-GetCellGroup().get(),
aGroupTests[i].bGroup[j]);
+ i, j, aGroupTests[i].bGroup[j],
!!pCur-GetCellGroup().get());
CPPUNIT_ASSERT_MESSAGE(Failed, false);
}
}
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 412f85d..f450f75 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1722,10 +1722,9 @@ bool ScFormulaCellGroup::IsCompatible(
ScSimilarFormulaDelta *pDelta )
/// formulae should produce pOther
ScSimilarFormulaDelta *ScFormulaCell::BuildDeltaTo( ScFormulaCell *pOtherCell )
{
-
-// FIXME: TODO - M1
-//if ( kohei_comparison_hash_not_equal( mnHash, pOther-mnHash )
-// return NULL;
+// are these formule at all similar ?
+if ( GetHash() != pOtherCell-GetHash() )
+return NULL;
FormulaToken **pThis = pCode-GetCode();
sal_uInt16 pThisLen = pCode-GetCodeLen();
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 23a2241..6368ba7 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1348,19 +1348,16 @@ bool ScTokenArray::ImplGetReference( ScRange rRange,
bool bValidOnly ) const
namespace {
+// we want to compare for similar not identical formulae
+// so we can't use actual row column indices.
size_t HashSingleRef( const ScSingleRefData rRef )
{
-SCsCOL nCol = rRef.Flags.bColRel ? rRef.nRelCol : rRef.nCol;
-SCsROW nRow = rRef.Flags.bRowRel ? rRef.nRelRow : rRef.nRow;
-SCsTAB nTab = rRef.Flags.bTabRel ? rRef.nRelTab : rRef.nTab;
-size_t nVal = nCol;
-nVal += (nRow 8);
-nVal += (nTab 16);
+size_t nVal = 0;
-// Embed flag values too.
nVal += rRef.Flags.bColRel;
nVal += (rRef.Flags.bRowRel 1);
nVal += (rRef.Flags.bTabRel 2);
+
return nVal;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx| 12 ++
cppcanvas/source/inc/outdevstate.hxx | 126 +++
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 ++
cppcanvas/source/mtfrenderer/outdevstate.hxx | 126 ---
4 files changed, 184 insertions(+), 129 deletions(-)
New commits:
commit 69b19ba284a1589a9e85b259dfe327cb7ee9d618
Author: Radek Doulik r...@novell.com
Date: Tue Mar 19 13:17:42 2013 +0100
implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeRestore records
Change-Id: Iac87870c0f50a74b7f4db4c674adcded1494c055
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c2902d6..4537368 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -28,8 +28,10 @@
#include canvasgraphichelper.hxx
#include action.hxx
+#include outdevstate.hxx
#include vector
+#include map
class GDIMetaFile;
class VirtualDevice;
@@ -166,6 +168,12 @@ static float GetSwapFloat( SvStream rSt )
}
};
+// EMF+
+typedef struct {
+XForm aWorldTransform;
+OutDevState aDevState;
+} EmfPlusGraphicState;
+
class ImplRenderer : public virtual Renderer, protected
CanvasGraphicHelper
{
public:
@@ -278,7 +286,6 @@ static float GetSwapFloat( SvStream rSt )
sal_Int32 nOriginY;
sal_Int32 nHDPI;
sal_Int32 nVDPI;
-::PolyPolygon aClippingPolygon;
/* EMF+ emf header info */
sal_Int32 nFrameLeft;
sal_Int32 nFrameTop;
@@ -292,6 +299,9 @@ static float GetSwapFloat( SvStream rSt )
boolmbMultipart;
sal_uInt16 mMFlags;
SvMemoryStream mMStream;
+/* emf+ graphic state stack */
+::std::mapint,EmfPlusGraphicState mGSStack;
+typedef ::std::mapint,EmfPlusGraphicState::iterator EPGSSIter;
};
diff --git a/cppcanvas/source/inc/outdevstate.hxx
b/cppcanvas/source/inc/outdevstate.hxx
new file mode 100644
index 000..26e1026
--- /dev/null
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _CPPCANVAS_OUTDEVSTATE_HXX
+#define _CPPCANVAS_OUTDEVSTATE_HXX
+
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/Sequence.hxx
+
+#include com/sun/star/rendering/StringContext.hpp
+#include com/sun/star/rendering/RenderState.hpp
+#include com/sun/star/rendering/XPolyPolygon2D.hpp
+#include com/sun/star/rendering/XCanvasFont.hpp
+#include com/sun/star/rendering/TextDirection.hpp
+#include basegfx/matrix/b2dhommatrix.hxx
+#include basegfx/polygon/b2dpolypolygon.hxx
+#include vcl/fntstyle.hxx
+#include vcl/vclenum.hxx
+#include vcl/outdev.hxx
+
+
+namespace cppcanvas
+{
+namespace internal
+{
+struct OutDevState
+{
+OutDevState() :
+clip(),
+clipRect(),
+xClipPoly(),
+
+lineColor(),
+fillColor(),
+textColor(),
+textFillColor(),
+textLineColor(),
+
+xFont(),
+transform(),
+mapModeTransform(),
+fontRotation(0.0),
+
+textEmphasisMarkStyle(EMPHASISMARK_NONE),
+pushFlags(PUSH_ALL),
+
textDirection(::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
+textAlignment(0), // TODO(Q2): Synchronize with implrenderer
+ // and possibly new rendering::TextAlignment
+textReliefStyle(RELIEF_NONE),
+textOverlineStyle(UNDERLINE_NONE),
+textUnderlineStyle(UNDERLINE_NONE),
+textStrikeoutStyle(STRIKEOUT_NONE),
+textReferencePoint(ALIGN_BASELINE),
+
+isTextOutlineModeSet( false ),
+isTextEffectShadowSet( false ),
+
[PATCH] odk: do not pack unused component.map file
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2838 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/2838/1 odk: do not pack unused component.map file Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf --- M odk/CustomTarget_settings.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile D solenv/bin/addsym.awk D solenv/src/component.map D solenv/src/reg-component.map D solenv/src/solaris_noexstk.map D solenv/src/unloadablecomponent.map 12 files changed, 0 insertions(+), 212 deletions(-) diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index dfe44df..fb798b0 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -32,17 +32,4 @@ tr -d \015 $ | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' $@ -ifneq ($(OS),WNT) -odkcommon_ZIPLIST += settings/component.uno.map -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,component.uno.map)) -$(odk_WORKDIR)/settings/component.uno.map: $(SRCDIR)/solenv/bin/addsym.awk $(SRCDIR)/solenv/src/component.map - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GEN,1) - tr -d \015 $(SRCDIR)/solenv/src/component.map | \ - $(if $(filter MACOSX,$(OS)),\ - tail -n +3 | head -3 | sed -e 's/.*component/_component/g' \ - -e 's/;[ ]*//',\ - awk -f $) $@ - chmod 664 $@ -endif - # vim: set noet sw=4 ts=4: diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index a6bc683..a65f6f6 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -50,7 +50,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)) COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag @@ -71,13 +70,6 @@ -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $ -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map $(COMP_MAPFILE) -#ifeq $(OS) MACOSX -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) $(COMP_MAPFILE) -#endif - ifeq $(OS) WIN $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) @@ -87,7 +79,6 @@ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else -#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 84195a8..34b6834 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -59,7 +59,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)) COMP_UNOPKG_MANIFEST = $(SAMPLE_GEN_OUT)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(SAMPLE_GEN_OUT)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(SAMPLE_GEN_OUT)/$(COMP_NAME).components COMP_REGISTERFLAG = $(SAMPLE_GEN_OUT)/devguide_$(COMP_NAME)_register_component.flag @@ -104,13 +103,6 @@ -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(SAMPLE_INC_OUT) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $ -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map $(COMP_MAPFILE) -#ifeq $(OS) MACOSX -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) $(COMP_MAPFILE) -#endif - ifeq $(OS) WIN $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) @@ -120,7 +112,6 @@ $(CPPUHELPERLIB) $(CPPULIB)
[Libreoffice-commits] core.git: 3 commits - offapi/com offapi/type_reference sw/source xmloff/source
offapi/com/sun/star/text/textfield/SetExpression.idl | 43 ---
offapi/type_reference/types.rdb |binary
sw/source/core/unocore/unomap.cxx|1
xmloff/source/text/txtfldi.cxx |1
4 files changed, 28 insertions(+), 17 deletions(-)
New commits:
commit 10459e41c4e28bb70e21761d46028a0341109b26
Author: Michael Stahl mst...@redhat.com
Date: Tue Mar 19 13:28:35 2013 +0100
remove unused VariableName code/comments
Change-Id: Ifa0ae6d870b48f4f1dec013c183efc64736dd8ea
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index 8e1f682..0aacac7 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1734,7 +1734,6 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{SW_PROP_NMID(UNO_NAME_INPUT), FIELD_PROP_BOOL1,
CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_SHOW_FORMULA), FIELD_PROP_BOOL3,
CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_IS_VISIBLE),
FIELD_PROP_BOOL2, CPPU_E2T(CPPUTYPE_BOOLEAN),PROPERTY_NONE, 0},
-//TODO: UNO_NAME_VARIABLE_NAME gibt es das wirklich?
{SW_PROP_NMID(UNO_NAME_SEQUENCE_VALUE),
FIELD_PROP_USHORT1, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0},
{SW_PROP_NMID(UNO_NAME_SUB_TYPE),
FIELD_PROP_SUBTYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE,0},
{SW_PROP_NMID(UNO_NAME_VALUE), FIELD_PROP_DOUBLE,
CPPU_E2T(CPPUTYPE_DOUBLE), PROPERTY_NONE, 0},
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 245d7e4..7e1fb29 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -154,7 +154,6 @@ const sal_Char sAPI_full_name[] = FullName;
const sal_Char sAPI_place_holder_type[] = PlaceHolderType;
const sal_Char sAPI_place_holder[] = PlaceHolder;
const sal_Char sAPI_hint[] = Hint;
-const sal_Char sAPI_variable_name[] = VariableName;
const sal_Char sAPI_name[] = Name;
const sal_Char sAPI_sub_type[] = SubType;
const sal_Char sAPI_numbering_separator[] = NumberingSeparator;
commit cd360473ae2618c24f4d3b83382fde9f1c7b175d
Author: Michael Stahl mst...@redhat.com
Date: Tue Mar 19 13:28:08 2013 +0100
offapi: reformat SetExpression.idl
Change-Id: I6119582d0809c12a273b15ea021758f8d3a6e196
diff --git a/offapi/com/sun/star/text/textfield/SetExpression.idl
b/offapi/com/sun/star/text/textfield/SetExpression.idl
index cb79b8b..d68c2c9 100644
--- a/offapi/com/sun/star/text/textfield/SetExpression.idl
+++ b/offapi/com/sun/star/text/textfield/SetExpression.idl
@@ -35,48 +35,61 @@ published service SetExpression
/** contains the textual content of the field.
*/
-[property]string Content;
+[property] string Content;
+
/** contains the current content of the text field.
-p This property is especially useful for import/export purposes. /p
+pThis property is especially useful for import/export purposes./p
*/
-[property]string CurrentPresentation;
+[property] string CurrentPresentation;
/** this is the number format for this field.
@see com::sun::star::util::NumberFormatter
*/
-[property]long NumberFormat;
+[property] long NumberFormat;
+
/** specifies the type of the numbering as
type scope=com::sun::star::styleNumberingType/type
*/
-[property]short NumberingType;
+[property] short NumberingType;
+
/** determines whether the content is displayed or evaluated.
*/
-[property]boolean IsShowFormula;
+[property] boolean IsShowFormula;
+
/** contains an informational text that is displayed at the user
interface if it's an input field.
*/
-[property]string Hint;
+[property] string Hint;
+
/** determines whether this field is an input field.
*/
-[property]boolean IsInput;
+[property] boolean IsInput;
+
/** determines whether the field is visible.
*/
-[property]boolean IsVisible;
+[property] boolean IsVisible;
+
/** contains the sequence value when this field is used as sequence field.
*/
-[property]short SequenceValue;
+[property] short SequenceValue;
+
/** determines the type of the variable as described in
type scope=com::sun::star::textSetVariableType/type
*/
-[property]short SubType;
+[property] short SubType;
+
/** contains the numerical value of the field.
*/
[property]double Value;
-/** contains the name of the set expression field master this field is
connected to.
+
+/** contains the name of the set expression field master this field is
+connected to.
*/
[property,
[ANNOUNCE] Branch libreoffice-3-6-6 created
Hi all, there have been created the libreoffice-3-6-6 branch. It will be used for fine tuning of the 4.6.6 release. The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-0 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything This is the last planned bug fix release for the LibreOffice 3.6 code line. Though, LibreOffice 3.6 is going to be supported next few months. We might want to release 3.6.7 because of a security bug or another critical issue. Hence, it still makes some sense to push critical fixes into the libreoffice-3-6 branch but they need not be used in the end. Please read more at http://wiki.documentfoundation.org/ReleasePlan http://wiki.documentfoundation.org/Development/Branches Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-3-6-6 origin/libreoffice-3-6-6 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-3-6-6 when you have switched to it. This will save you some git shouting at you. Happy hacking, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/bookmrk.cxx | 40 +++
sw/source/core/crsr/crossrefbookmark.cxx |4 +--
sw/source/core/layout/dbg_lay.cxx| 12 -
3 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 293006f92171b048f528664cc4e4be1d983a9367
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Mon Mar 18 23:16:20 2013 +0100
Remove RTL_CONSTASCII_(U)STRINGPARAM in sw (2)
Change-Id: I5f84d997855321145179a9d6198a0d093dc62a95
Reviewed-on: https://gerrit.libreoffice.org/2837
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index dde7b14..09f3438 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -162,12 +162,12 @@ namespace sw { namespace mark
OUString MarkBase::ToString( ) const
{
OUStringBuffer buf;
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(Mark: ( Name, [ Node1,
Index1 ] ): ( ));
-buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, [ ));
+buf.append(Mark: ( Name, [ Node1, Index1 ] ): ( );
+buf.append( m_aName ).append(, [ );
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetMarkPos().nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ] )) );
+.append( ] ));
return buf.makeStringAndClear( );
}
@@ -307,18 +307,18 @@ namespace sw { namespace mark
OUString Fieldmark::ToString( ) const
{
OUStringBuffer buf;
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( ));
-buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
-buf.append( m_aFieldname ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, [
));
+buf.append(
+Fieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): ( );
+buf.append( m_aName ).append(, );
+buf.append( m_aFieldname ).append(, [ );
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ], [));
+.append( ], [);
buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ] ) ));
+.append( ] ) );
return buf.makeStringAndClear( );
}
@@ -388,18 +388,18 @@ namespace sw { namespace mark
OUString CheckboxFieldmark::toString( ) const
{
OUStringBuffer buf;
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(
-CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (
));
-buf.append( m_aName ).appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
-buf.append( GetFieldname() ).appendAscii(RTL_CONSTASCII_STRINGPARAM(,
[ ));
+buf.append(
+CheckboxFieldmark: ( Name, Type, [ Nd1, Id1 ], [ Nd2, Id2 ] ): (
);
+buf.append( m_aName ).append(, );
+buf.append( GetFieldname() ).append(, [ );
buf.append( sal_Int32( GetMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ], [));
+.append( ], [);
buf.append( sal_Int32( GetOtherMarkPos().nNode.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM(, ));
+.append(, );
buf.append( sal_Int32( GetOtherMarkPos( ).nContent.GetIndex( ) ) )
-.appendAscii(RTL_CONSTASCII_STRINGPARAM( ] ) ));
+.append( ] ) );
return buf.makeStringAndClear( );
}
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx
b/sw/source/core/crsr/crossrefbookmark.cxx
index 88452bf..0e8a08d 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -72,7 +72,7 @@ namespace sw { namespace mark
bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString rName)
{
-return
rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefHeadingBookmark_NamePrefix));
+return rName.match(CrossRefHeadingBookmark_NamePrefix);
}
const char CrossRefNumItemBookmark_NamePrefix[] = __RefNumPara__;
@@ -86,7 +86,7 @@ namespace sw { namespace mark
bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString rName)
{
-return
[ANNOUNCE] libreoffice-3.6.6.1 tag created
Hi, there have been created the libreoffice-3.6.6.1 tag, aka rc1. The corresponding official builds will be available within next few days. See the attached list of changes against 3.6.5.2. Now, you might switch your current 3-6 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-3.6.6.1 libreoffice-3.6.6.1 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#3.6_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr bnc#404221 PPT export: fix text rotation in shapes: [Michael Stahl] bnc#590020 oocalc produces wrong XY-diagrams, probably wrong sorting of x values [Kohei Yoshida] bnc#798271 Charts are not visible after save [Kohei Yoshida] bnc#798309 OOXML import: A shape with background are missed when importing xlsx. [Noel Power] fdo#33484 Printing multiple files from Windows Explorer at once makes LibreOffice unusable [Stephan Bergmann] fdo#34548 EDITING: CRASH in action after Undo [David Tardon] fdo#34800 EDITING: Comments added to footer are placed at the right top of the page. [Joren De Cuyper] fdo#34897 FILESAVE as .ppt mis-rotates text [Michael Stahl] fdo#35365 Wrong automatic text color dark grey with black background for some GNOME themes [Benjamin Drung] fdo#37449 Crash when previewing the Pgtextje.ttf font in the font list [Caolán McNamara] fdo#39135 EDITING CRASH when R1C1 conversion (Shift+F4) from relative to absolute [Kohei Yoshida] fdo#45879 VIEWING: Selected Glue Point no longer highlighted [Michael Meeks] fdo#49784 CRASH when FILEOPEN particular document containing .svm pictures [Julien Nabet] fdo#52286 FILESAVE as .RTF will show subscript and superscript with normal font height instead of reduced height [Miklos Vajna] fdo#54087 Firefox plugin not recognized in LibO 3.6 (regression) [Andras Timar] fdo#54275 Linux: Unable to Save (or Save As) New Document on Samba (gvfs) Mounted Share [Stephan Bergmann] fdo#56031 Accessible Text Interface not updating until word boundary at caret offset [Caolán McNamara] fdo#57465 : Calc sorts columns incorrectly [Markus Mohrhard] fdo#58204 Textbox properties export to PPT bad (Impress) [Michael Stahl] fdo#58283 .desktop files miss translations - LibO descriptions untranslated in application menu [David Tardon] fdo#58415 CRASH with option - general - USE DIALOG BOX Libo if folder contains a file with Pipe car. [Stephan Bergmann] fdo#58730 paragraph styles line spacing does not stick when also specifying non-zero left and right margins [Caolán McNamara] fdo#58893 [CRASH] FILEOPEN : master document with linked template modified [Michael Stahl] fdo#59583 EDITING: Cannot use formula with user-defined function [Eike Rathke] fdo#59616 CRASH when FILEOPEN particular .svm image [Thorsten Behrens] fdo#59965 UI: program crash dialog looks unfinished [Caolán McNamara] fdo#60078 IMCSCH and IMSECH wrongly calculated [Regina Henschel] fdo#60139 LO cannot start Fatal error on Mac: lightproof-hu_hu-1.3.oxt clashes with bundled dict-hu.oxt [Stephan Bergmann] fdo#60144 EDITING: Crash when inserting hyperlink [Caolán McNamara] fdo#60353 Crash at startup on OSX 10.8.2 and LibreOffice 3.6.5 German Language Pack [Stephan Bergmann] fdo#60366 EDITING: MATCH() function fails (err: 504) when parameter 2 (LookupArray) is a single-cell named range [Eike Rathke] fdo#60386 Document Statistics shell extension not translated [David Tardon] fdo#60491 missing emboleobj library on non-Windows platforms, causing Editing embedded Excel spreadsheet in Writer to fail [Michael Stahl] fdo#60668 FILESAVE: Libreoffice Writer 4.0 crashing on saving file [Michael Stahl] fdo#60701 Send Document as email fails, when application is installed to a directory with a space [Stephan Bergmann] fdo#60732 EDITING: Writer loops and/or crashes with max. 64k characters in paragraph [Michael Stahl] fdo#60760 FILEOPEN loading 4.0.0.3 saved file with conditional formating can't be loaded in 3.6.5 (endless recovery) [Markus Mohrhard] fdo#60915 FORMATTING: Date with [~buddhist] always show the year with 4 digits [Eike Rathke] fdo#61000 FILEOPEN: Incorrect argument to UNO call at NumberingManager.cxx:650 result in crash due to negative tab stop position [Michael Stahl] fdo#61660 unhelpful dictionary entries... [Andras Timar] fdo#62103 File conflicts between language packs [Andras Timar] fdo#62360 Affixed forms of %, §, °C aren't recognized by the Hungarian spell checker [László Németh] i#116981 rtl/source/bootstrap.cxx does not clean up memory [Stephan Bergmann] rhbz#760765 copy custom styles on copy paste [David Tardon] rhbz#818557 [abrt] libreoffice-writer-3.3.4.1-2.fc15: SwCrsrShell::GetCrsr: Process /usr/lib64/libreoffice/program/swriter.bin was killed by signal 11 (SIGSEGV) [Michael Stahl] rhbz#847519 [fix available] segfault at chart
[PUSHED] Remove RTL_CONSTASCII_(U)STRINGPARAM in sw (2)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2837 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2837 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f84d997855321145179a9d6198a0d093dc62a95 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/trvlfrm.cxx | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit a996678ed30804e16103e1cfdc439c8546e5d3b0
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Mar 19 13:41:19 2013 +0100
bnc#802888 SwPageFrm: let macro fields have priority over background objects
The intention is to get similar behavior as
61f467c8974d6b6face41e7027d75ae4ddb6fdb2, except this applies to single
clicks, while that one affected only double-click.
Change-Id: Idddc26aa8cd064f89fb4f99b3ad7a5430ac455bc
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 7728a98..a1ace40 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -50,6 +50,9 @@
#include dcontact.hxx
// OD 2004-05-24 #i28701#
#include sortedobjs.hxx
+#include txatbase.hxx
+#include fmtfld.hxx
+#include fldbas.hxx
// FLT_MAX
#include cfloat
@@ -290,10 +293,24 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
bValidTextDistance = true;
}
+bool bConsiderBackground = true;
+// If the text position if a macro field, then that should have
priority.
+if (pTextNd-IsTxtNode())
+{
+SwTxtNode* pTxtNd = pTextNd-GetTxtNode();
+SwTxtAttr* pTxtAttr =
pTxtNd-GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
+if (pTxtAttr)
+{
+const SwField* pField = pTxtAttr-GetFld().GetFld();
+if (pField-Which() == RES_MACROFLD)
+bConsiderBackground = false;
+}
+}
+
double nBackDistance = 0;
bool bValidBackDistance = false;
SwCntntNode* pBackNd = aBackPos.nNode.GetNode( ).GetCntntNode( );
-if ( pBackNd )
+if ( pBackNd bConsiderBackground)
{
// FIXME There are still cases were we don't have the proper
node here.
SwCntntFrm* pBackFrm = pBackNd-getLayoutFrm( getRootFrm( ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] converted cui/source/options/optsave.src to .ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2816 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2816 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieaef10684f45dc699e7d2c56dffca5483f0a30cc Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Krisztian Pinter pin.termina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx| 12 ++
cppcanvas/source/inc/outdevstate.hxx | 126 +++
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 ++
cppcanvas/source/mtfrenderer/outdevstate.hxx | 126 ---
4 files changed, 184 insertions(+), 129 deletions(-)
New commits:
commit 5a86702e13b3654982f1ee84da981d7fb8c442c5
Author: Radek Doulik r...@novell.com
Date: Tue Mar 19 13:17:42 2013 +0100
implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeRestore records
Change-Id: Iac87870c0f50a74b7f4db4c674adcded1494c055
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c2902d6..4537368 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -28,8 +28,10 @@
#include canvasgraphichelper.hxx
#include action.hxx
+#include outdevstate.hxx
#include vector
+#include map
class GDIMetaFile;
class VirtualDevice;
@@ -166,6 +168,12 @@ static float GetSwapFloat( SvStream rSt )
}
};
+// EMF+
+typedef struct {
+XForm aWorldTransform;
+OutDevState aDevState;
+} EmfPlusGraphicState;
+
class ImplRenderer : public virtual Renderer, protected
CanvasGraphicHelper
{
public:
@@ -278,7 +286,6 @@ static float GetSwapFloat( SvStream rSt )
sal_Int32 nOriginY;
sal_Int32 nHDPI;
sal_Int32 nVDPI;
-::PolyPolygon aClippingPolygon;
/* EMF+ emf header info */
sal_Int32 nFrameLeft;
sal_Int32 nFrameTop;
@@ -292,6 +299,9 @@ static float GetSwapFloat( SvStream rSt )
boolmbMultipart;
sal_uInt16 mMFlags;
SvMemoryStream mMStream;
+/* emf+ graphic state stack */
+::std::mapint,EmfPlusGraphicState mGSStack;
+typedef ::std::mapint,EmfPlusGraphicState::iterator EPGSSIter;
};
diff --git a/cppcanvas/source/inc/outdevstate.hxx
b/cppcanvas/source/inc/outdevstate.hxx
new file mode 100644
index 000..26e1026
--- /dev/null
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _CPPCANVAS_OUTDEVSTATE_HXX
+#define _CPPCANVAS_OUTDEVSTATE_HXX
+
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/Sequence.hxx
+
+#include com/sun/star/rendering/StringContext.hpp
+#include com/sun/star/rendering/RenderState.hpp
+#include com/sun/star/rendering/XPolyPolygon2D.hpp
+#include com/sun/star/rendering/XCanvasFont.hpp
+#include com/sun/star/rendering/TextDirection.hpp
+#include basegfx/matrix/b2dhommatrix.hxx
+#include basegfx/polygon/b2dpolypolygon.hxx
+#include vcl/fntstyle.hxx
+#include vcl/vclenum.hxx
+#include vcl/outdev.hxx
+
+
+namespace cppcanvas
+{
+namespace internal
+{
+struct OutDevState
+{
+OutDevState() :
+clip(),
+clipRect(),
+xClipPoly(),
+
+lineColor(),
+fillColor(),
+textColor(),
+textFillColor(),
+textLineColor(),
+
+xFont(),
+transform(),
+mapModeTransform(),
+fontRotation(0.0),
+
+textEmphasisMarkStyle(EMPHASISMARK_NONE),
+pushFlags(PUSH_ALL),
+
textDirection(::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
+textAlignment(0), // TODO(Q2): Synchronize with implrenderer
+ // and possibly new rendering::TextAlignment
+textReliefStyle(RELIEF_NONE),
+textOverlineStyle(UNDERLINE_NONE),
+textUnderlineStyle(UNDERLINE_NONE),
+textStrikeoutStyle(STRIKEOUT_NONE),
+textReferencePoint(ALIGN_BASELINE),
+
+isTextOutlineModeSet( false
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk
bridges/Library_cpp_uno.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 90a2d46ecb5a3a6ceccc280d2238437bef52c570 Author: Tor Lillqvist t...@iki.fi Date: Tue Mar 19 14:57:08 2013 +0200 Add the call.s source for the MinGW case Another blind fix attempt. Change-Id: I5ec2ba5e595a382c53e6975b8dc65644fc8e7409 diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 5a7516f..5a2eae2 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -78,6 +78,7 @@ bridge_exception_objects := cpp2uno dllinit uno2cpp bridge_noopt_objects := except else ifeq ($(OS)$(COM),WNTGCC) bridges_SELECTED_BRIDGE := mingw_intel +bridge_asm_objects := call bridge_noopt_objects := uno2cpp bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: icerun busts unit tests ?
On Monday 18 of March 2013, Michael Meeks wrote: - icerun $O/bin/cppunit/cppunittester $W/LinkTarget/CppunitTest/libtest_sc_ucalc.so ... || echo failed + $O/bin/cppunit/cppunittester $W/LinkTarget/CppunitTest/libtest_sc_ucalc.so ... || echo failed The 2nd produces a 'failed' but not the first. Is there some way we can propagate the failure / exit code from the spawned process through icerun ? perhaps that is fixed already, I have: $ icerun --version ICERUN 0.9.98.3 Hmm ... WEXITSTATUS fun :-/ ... I'll fix this upstream. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig icon-themes/galaxy icon-themes/hicontrast icon-themes/human icon-themes/oxygen xmlsecurity/uiconfig
cui/uiconfig/ui/optsavepage.ui |2 +- dev/null |binary xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 5f92d07b80c4a73ebbf9e3e9ddfdf771a676c4ba Author: Andras Timar ati...@suse.com Date: Tue Mar 19 13:59:23 2013 +0100 fix the 'warning' icon in .ui files Images in .ui files can be loaded from resources (images.zip). However, only those images are packed into images.zip, which are used in traditional .src resources. We need to tweak packimages.pl one day. Change-Id: Ic954f2561e66880c7f7ff3ed941ccb28a86d83e1 diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui index 3004e73..00016df 100644 --- a/cui/uiconfig/ui/optsavepage.ui +++ b/cui/uiconfig/ui/optsavepage.ui @@ -496,7 +496,7 @@ object class=GtkImage id=odfwarning_image property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufsvx/res/odfwarning.png/property +property name=pixbufsvx/res/caution_11x16.png/property /object packing property name=left_attach0/property diff --git a/icon-themes/galaxy/svx/res/odfwarning.png b/icon-themes/galaxy/svx/res/odfwarning.png deleted file mode 100644 index 4ccc785..000 Binary files a/icon-themes/galaxy/svx/res/odfwarning.png and /dev/null differ diff --git a/icon-themes/galaxy/xmlsecurity/res/caution_11x16.png b/icon-themes/galaxy/xmlsecurity/res/caution_11x16.png deleted file mode 100644 index bb71d2b..000 Binary files a/icon-themes/galaxy/xmlsecurity/res/caution_11x16.png and /dev/null differ diff --git a/icon-themes/hicontrast/svx/res/odfwarning.png b/icon-themes/hicontrast/svx/res/odfwarning.png deleted file mode 100644 index e0c029a..000 Binary files a/icon-themes/hicontrast/svx/res/odfwarning.png and /dev/null differ diff --git a/icon-themes/hicontrast/xmlsecurity/res/caution_11x16.png b/icon-themes/hicontrast/xmlsecurity/res/caution_11x16.png deleted file mode 100644 index 8f16def..000 Binary files a/icon-themes/hicontrast/xmlsecurity/res/caution_11x16.png and /dev/null differ diff --git a/icon-themes/human/svx/res/odfwarning.png b/icon-themes/human/svx/res/odfwarning.png deleted file mode 100644 index dfd3c5a..000 Binary files a/icon-themes/human/svx/res/odfwarning.png and /dev/null differ diff --git a/icon-themes/human/xmlsecurity/res/caution_11x16.png b/icon-themes/human/xmlsecurity/res/caution_11x16.png deleted file mode 100644 index dfd3c5a..000 Binary files a/icon-themes/human/xmlsecurity/res/caution_11x16.png and /dev/null differ diff --git a/icon-themes/oxygen/svx/res/odfwarning.png b/icon-themes/oxygen/svx/res/odfwarning.png deleted file mode 100644 index dfd3c5a..000 Binary files a/icon-themes/oxygen/svx/res/odfwarning.png and /dev/null differ diff --git a/icon-themes/oxygen/xmlsecurity/res/caution_11x16.png b/icon-themes/oxygen/xmlsecurity/res/caution_11x16.png deleted file mode 100644 index dfd3c5a..000 Binary files a/icon-themes/oxygen/xmlsecurity/res/caution_11x16.png and /dev/null differ diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui index 414f80d..56d0e13 100644 --- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui +++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui @@ -310,7 +310,7 @@ object class=GtkImage id=invalidimg property name=can_focusFalse/property property name=no_show_allTrue/property -property name=pixbufxmlsecurity/res/caution_11x16.png/property +property name=pixbufsvx/res/caution_11x16.png/property /object packing property name=left_attach0/property @@ -323,7 +323,7 @@ object class=GtkImage id=oldsignatureimg property name=can_focusFalse/property property name=no_show_allTrue/property -property name=pixbufxmlsecurity/res/caution_11x16.png/property +property name=pixbufsvx/res/caution_11x16.png/property /object packing property name=left_attach0/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0-2] implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeResto...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2839
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/2839/1
implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeRestore records
Signed-off-by: Fridrich Štrba fridrich.st...@bluewin.ch
(cherry picked from commit 5a86702e13b3654982f1ee84da981d7fb8c442c5)
Change-Id: Iac87870c0f50a74b7f4db4c674adcded1494c055
---
M cppcanvas/source/inc/implrenderer.hxx
R cppcanvas/source/inc/outdevstate.hxx
M cppcanvas/source/mtfrenderer/emfplus.cxx
3 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c2902d6..4537368 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -28,8 +28,10 @@
#include canvasgraphichelper.hxx
#include action.hxx
+#include outdevstate.hxx
#include vector
+#include map
class GDIMetaFile;
class VirtualDevice;
@@ -166,6 +168,12 @@
}
};
+// EMF+
+typedef struct {
+XForm aWorldTransform;
+OutDevState aDevState;
+} EmfPlusGraphicState;
+
class ImplRenderer : public virtual Renderer, protected
CanvasGraphicHelper
{
public:
@@ -278,7 +286,6 @@
sal_Int32 nOriginY;
sal_Int32 nHDPI;
sal_Int32 nVDPI;
-::PolyPolygon aClippingPolygon;
/* EMF+ emf header info */
sal_Int32 nFrameLeft;
sal_Int32 nFrameTop;
@@ -292,6 +299,9 @@
boolmbMultipart;
sal_uInt16 mMFlags;
SvMemoryStream mMStream;
+/* emf+ graphic state stack */
+::std::mapint,EmfPlusGraphicState mGSStack;
+typedef ::std::mapint,EmfPlusGraphicState::iterator EPGSSIter;
};
diff --git a/cppcanvas/source/mtfrenderer/outdevstate.hxx
b/cppcanvas/source/inc/outdevstate.hxx
similarity index 100%
rename from cppcanvas/source/mtfrenderer/outdevstate.hxx
rename to cppcanvas/source/inc/outdevstate.hxx
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 491b085..81f7eb7 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -68,6 +68,7 @@
#define EmfPlusRecordTypeSetPixelOffsetMode 16418
#define EmfPlusRecordTypeSetCompositingQuality 16420
#define EmfPlusRecordTypeSave 16421
+#define EmfPlusRecordTypeRestore 16422
#define EmfPlusRecordTypeSetWorldTransform 16426
#define EmfPlusRecordTypeResetWorldTransform 16427
#define EmfPlusRecordTypeMultiplyWorldTransform 16428
@@ -1658,9 +1659,53 @@
EMFP_DEBUG (printf (EMF+\tTODO\n));
break;
case EmfPlusRecordTypeSave:
-EMFP_DEBUG (printf (EMF+ Save\n));
-EMFP_DEBUG (printf (EMF+\tTODO\n));
+{
+sal_uInt32 stackIndex;
+
+rMF stackIndex;
+
+EMFP_DEBUG (printf (EMF+ Save stack index: %d\n,
stackIndex));
+
+EPGSSIter aIter = mGSStack.find( stackIndex );
+
+if ( aIter != mGSStack.end() )
+{
+EmfPlusGraphicState aState = aIter-second;
+mGSStack.erase( aIter );
+
+EMFP_DEBUG (printf (stack index: %d found and
erased\n, stackIndex));
+}
+
+EmfPlusGraphicState aState;
+
+aState.aWorldTransform = aWorldTransform;
+aState.aDevState = rState;
+
+mGSStack[ stackIndex ] = aState;
+
break;
+}
+case EmfPlusRecordTypeRestore:
+{
+sal_uInt32 stackIndex;
+
+rMF stackIndex;
+
+EMFP_DEBUG (printf (EMF+ Restore stack index: %d\n,
stackIndex));
+
+EPGSSIter aIter = mGSStack.find( stackIndex );
+
+if ( aIter != mGSStack.end() ) {
+EMFP_DEBUG (printf (stack index: %d found\n,
stackIndex));
+EmfPlusGraphicState aState = aIter-second;
+aWorldTransform = aState.aWorldTransform;
+rState.clip = aState.aDevState.clip;
+rState.clipRect = aState.aDevState.clipRect;
+rState.xClipPoly = aState.aDevState.xClipPoly;
+}
+
+break;
+}
case EmfPlusRecordTypeSetWorldTransform: {
EMFP_DEBUG (printf (EMF+ SetWorldTransform\n));
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - basic/qa basic/source
basic/qa/cppunit/test_vba.cxx |7 ---
basic/qa/vba_tests/ole_dfltObjDflMethod.vb | 24
basic/source/classes/sbunoobj.cxx |4
basic/source/runtime/step2.cxx | 26 +-
4 files changed, 57 insertions(+), 4 deletions(-)
New commits:
commit d203bd8ec95788e96a5a00719252339a0c147b31
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 15 20:49:11 2013 +
WaE: Werror=shadow
Change-Id: I7f1bddbed85076f1c909d0d9f4ecdd1cda6f1880
diff --git a/basic/source/runtime/step2.cxx b/basic/source/runtime/step2.cxx
index 0edc546..d5d34fc 100644
--- a/basic/source/runtime/step2.cxx
+++ b/basic/source/runtime/step2.cxx
@@ -573,16 +573,16 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
if ( pDflt )
{
pDflt-Broadcast( SBX_HINT_DATAWANTED );
-SbxBaseRef pObj = (SbxBase*)pDflt-GetObject();
-if( pObj )
+SbxBaseRef pDfltObj =
(SbxBase*)pDflt-GetObject();
+if( pDfltObj )
{
-if( pObj-ISA(SbUnoObject) )
+if( pDfltObj-ISA(SbUnoObject) )
{
-pUnoObj = (SbUnoObject*)(SbxBase*)pObj;
-Any aAny = pUnoObj-getUnoAny();
+pUnoObj =
(SbUnoObject*)(SbxBase*)pDfltObj;
+Any aUnoAny = pUnoObj-getUnoAny();
-if( aAny.getValueType().getTypeClass()
== TypeClass_INTERFACE )
-x = *(Reference XInterface
*)aAny.getValue();
+if(
aUnoAny.getValueType().getTypeClass() == TypeClass_INTERFACE )
+x = *(Reference XInterface
*)aUnoAny.getValue();
pElem = pDflt;
}
}
commit 7263af3eee67b25a01ef4154e69eba728a2db190
Author: Noel Power noel.po...@novell.com
Date: Fri Mar 15 15:47:03 2013 +
detect follow-on default member of default member object bnc#809017
Change-Id: I3ccae692db44bb3ce41b371f0b511a9db7181bf4
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 703884f..4e01b70 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -22,7 +22,7 @@ namespace
VBATest() : BootstrapFixture(true, false) {}
~VBATest(){}
void testMiscVBAFunctions();
-void testObjAssignWithDefaultMember();
+void testMiscOLEStuff();
// Adds code needed to register the test suite
CPPUNIT_TEST_SUITE(VBATest);
@@ -30,7 +30,7 @@ namespace
CPPUNIT_TEST(testMiscVBAFunctions);
// not much point even trying to run except on windows
#if defined(WNT)
-CPPUNIT_TEST(testObjAssignWithDefaultMember);
+CPPUNIT_TEST(testMiscOLEStuff);
#endif
// End of test suite definition
@@ -106,7 +106,7 @@ void VBATest::testMiscVBAFunctions()
}
}
-void VBATest::testObjAssignWithDefaultMember()
+void VBATest::testMiscOLEStuff()
{
bool bCanRunOleTests = hasOLEEnv();
if ( !bCanRunOleTests )
@@ -115,6 +115,7 @@ void VBATest::testObjAssignWithDefaultMember()
const char* macroSource[] = {
ole_ObjAssignNoDflt.vb,
ole_ObjAssignToNothing.vb,
+ole_dfltObjDflMethod.vb,
};
rtl::OUString sMacroPathURL = getURLFromSrc(/basic/qa/vba_tests/);
diff --git a/basic/qa/vba_tests/ole_dfltObjDflMethod.vb
b/basic/qa/vba_tests/ole_dfltObjDflMethod.vb
new file mode 100644
index 000..f247860
--- /dev/null
+++ b/basic/qa/vba_tests/ole_dfltObjDflMethod.vb
@@ -0,0 +1,24 @@
+Option VBASupport 1
+Option Explicit
+
+Rem Test accessing an object that has default object member
+Rem which in turn has a default member that is a method
+Function doUnitTest(TestData As String) As String
+doUnitTest = Begin
+Dim modifiedTimout As Long
+Dim cnn1 As New ADODB.Connection
+Dim rst1 As New ADODB.Recordset
+Dim conStr As String
+cnn1.Open Provider=Microsoft.Jet.OLEDB.4.0; _
+Data Source= TestData ; _
+Extended Properties=Excel 8.0;HDR=Yes;
+rst1.Open SELECT * FROM [Sheet1$];, cnn1, adOpenStatic, adLockReadOnly
+Dim val
+val = rst1(FirstName)
+If val = Paddy Then
+doUnitTest = OK
+Else
+doUnitTest = Failed, expected 'Paddy' got val
+End If
+
+End Function
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 1a38e04..11a7f87 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -323,6 +323,10 @@ SbUnoObject*
[Libreoffice-commits] core.git: odk/CustomTarget_settings.mk odk/examples solenv/bin solenv/src
odk/CustomTarget_settings.mk | 13 -- odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile |9 - odk/examples/DevelopersGuide/Components/CppComponent/Makefile |9 - odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile |8 - odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile |8 - odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile |8 - odk/examples/cpp/complextoolbarcontrols/Makefile |9 - solenv/bin/addsym.awk | 56 -- solenv/src/component.map | 23 solenv/src/reg-component.map | 24 solenv/src/solaris_noexstk.map | 21 --- solenv/src/unloadablecomponent.map | 24 12 files changed, 212 deletions(-) New commits: commit 2633b249ea6921645c57ab24a1c9ad0c8e61e144 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Mar 16 23:28:59 2013 +0100 odk: do not pack unused component.map file Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index dfe44df..fb798b0 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -32,17 +32,4 @@ $(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk tr -d \015 $ | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' $@ -ifneq ($(OS),WNT) -odkcommon_ZIPLIST += settings/component.uno.map -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,component.uno.map)) -$(odk_WORKDIR)/settings/component.uno.map: $(SRCDIR)/solenv/bin/addsym.awk $(SRCDIR)/solenv/src/component.map - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GEN,1) - tr -d \015 $(SRCDIR)/solenv/src/component.map | \ - $(if $(filter MACOSX,$(OS)),\ - tail -n +3 | head -3 | sed -e 's/.*component/_component/g' \ - -e 's/;[ ]*//',\ - awk -f $) $@ - chmod 664 $@ -endif - # vim: set noet sw=4 ts=4: diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index a6bc683..a65f6f6 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -50,7 +50,6 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMP_NAME) COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)) COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag @@ -71,13 +70,6 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $ -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map $(COMP_MAPFILE) -#ifeq $(OS) MACOSX -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) $(COMP_MAPFILE) -#endif - ifeq $(OS) WIN $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) @@ -87,7 +79,6 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else -#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 84195a8..34b6834 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -59,7 +59,6 @@ COMP_RDB = $(SAMPLE_GEN_OUT)/$(COMP_RDB_NAME) COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT))
[Libreoffice-commits] core.git: basctl/source basic/qa canvas/source dbaccess/source desktop/source desktop/unx extensions/source filter/source i18npool/source idlc/source io/source io/test odk/exampl
basctl/source/basicide/baside2b.cxx |6
+--
basctl/source/basicide/moduldl2.cxx |2 -
basic/qa/cppunit/test_vba.cxx |2 -
canvas/source/cairo/cairo_devicehelper.cxx|2 -
dbaccess/source/ui/browser/dbloader.cxx |4 +-
dbaccess/source/ui/browser/unodatbr.cxx |2 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx| 18
--
desktop/source/app/app.cxx|6
+--
desktop/source/app/officeipcthread.cxx|6
+--
desktop/unx/source/officeloader/officeloader.cxx |2 -
extensions/source/plugin/win/winmgr.cxx |2 -
filter/source/placeware/exporter.cxx |2 -
filter/source/placeware/tempfile.cxx |4 +-
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |4 --
filter/source/xsltdialog/xmlfiltertestdialog.cxx |2 -
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |4 +-
i18npool/source/localedata/LocaleNode.cxx |6
+--
idlc/source/idlccompile.cxx |4 +-
io/source/acceptor/acc_pipe.cxx |2 -
io/source/acceptor/acc_socket.cxx |2 -
io/test/testcomponent.cxx |2 -
odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx|2 -
padmin/source/adddlg.cxx |2 -
registry/workben/regspeed.cxx |6
+--
rsc/source/rsc/rsc.cxx|2 -
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx|7
+--
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx |4 +-
sax/source/expatwrap/sax_expat.cxx|6
+--
sax/test/testcomponent.cxx|4 +-
stoc/test/testregistry.cxx|8
++--
stoc/test/testsmgr.cxx|2 -
store/workben/t_store.cxx |5 +-
svtools/source/brwbox/brwbox3.cxx | 18
+-
svtools/source/config/printoptions.cxx|4 +-
svx/source/dialog/docrecovery.cxx |2 -
svx/source/unodraw/recoveryui.cxx |4 +-
svx/workben/msview/xmlconfig.cxx | 11
++
sw/source/filter/ww8/docxattributeoutput.cxx |2 -
toolkit/source/awt/vclxmenu.cxx |6
+--
toolkit/source/controls/formattedcontrol.cxx |2 -
vcl/generic/app/gensys.cxx|2 -
vcl/source/app/unohelp.cxx|4 +-
vcl/source/gdi/pdfwriter_impl.cxx |2 -
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |2 -
writerfilter/qa/cppunittests/odiapi/testProperty.cxx |2 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 -
46 files changed, 94 insertions(+), 101 deletions(-)
New commits:
commit 5bb4a2ba1d8a6b98720868786e552aa8fd2a22eb
Author: Thomas Arnhold tho...@arnhold.org
Date: Tue Mar 19 14:16:55 2013 +0100
further OUString cleanup
Change-Id: I19954ee5976cb881a5fe73a889c8e04a19b14eb6
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 8ab5dd9..bb81726 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1366,7 +1366,7 @@ void WatchWindow::AddWatch( const String rVName )
WatchItem* pWatchItem = new WatchItem(aVar);
OUString aWatchStr_( aVar );
-aWatchStr_ += OUString( \t\t );
+aWatchStr_ += \t\t;
SvTreeListEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0,
true, LIST_APPEND );
pNewEntry-SetUserData( pWatchItem );
@@ -2121,7 +2121,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
}
else
{
-aWatchStr += OUString( ? );
+aWatchStr += ?;
}
}
else if ( (sal_uInt8)eType == (sal_uInt8)SbxOBJECT )
@@ -2199,7 +2199,7 @@ void
[PUSHED] odk: do not pack unused component.map file
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2838 -- To view, visit https://gerrit.libreoffice.org/2838 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx | 13 +++
sc/source/core/data/cell2.cxx | 34 +--
sc/source/core/data/column.cxx |1
sc/source/core/data/column3.cxx | 71
4 files changed, 94 insertions(+), 25 deletions(-)
New commits:
commit a53c3df6139c2421f873e438a3e7a3752c1f2df6
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 19 12:56:51 2013 +
build spans of doubles and cleanup excessive debug.
Change-Id: Ib76596cae12c87825118903cc61b12c251f0c1b7
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 18543f0..4776a70 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -25,6 +25,7 @@
#include address.hxx
#include rangenam.hxx
#include types.hxx
+#include boost/intrusive_ptr.hpp
#include set
#include vector
@@ -71,6 +72,8 @@ class ScFlatBoolRowSegments;
struct ScSetStringParam;
struct ScColWidthParam;
class ScColumnTextWidthIterator;
+class ScFormulaCellGroup;
+typedef ::boost::intrusive_ptrScFormulaCellGroup ScFormulaCellGroupRef;
struct ScNeededSizeOptions
{
@@ -89,6 +92,12 @@ struct ColEntry
ScBaseCell* pCell;
};
+struct ColDoubleEntry
+{
+SCROW mnStart;
+std::vectordouble maData;
+};
+
class ScColumn
{
typedef mdds::multi_type_vectormdds::mtv::element_block_func
TextWidthType;
@@ -109,6 +118,10 @@ class ScColumn
std::vectorColEntry maItems;
+// temporary until we switch to mdds container
+std::vectorColDoubleEntry * maDoubles;
+std::vectorScFormulaCellGroupRef maFnGroups;
+
ScAttrArray* pAttrArray;
ScDocument* pDocument;
bool bDirtyGroups; /// formula groups are dirty.
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index f450f75..ca21710 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -1733,15 +1733,12 @@ ScSimilarFormulaDelta *ScFormulaCell::BuildDeltaTo(
ScFormulaCell *pOtherCell )
if ( !pThis || !pOther )
{
-fprintf( stderr, no compiled code for cells ! );
+fprintf( stderr, Error: no compiled code for cells ! );
return NULL;
}
if ( pThisLen != pOtherLen )
-{
-fprintf( stderr, different length formulae ! );
return NULL;
-}
// check we are basically the same function
for ( sal_uInt16 i = 0; i pThisLen; i++ )
@@ -1750,7 +1747,7 @@ ScSimilarFormulaDelta *ScFormulaCell::BuildDeltaTo(
ScFormulaCell *pOtherCell )
pThis[ i ]-GetOpCode() != pOther[ i ]-GetOpCode() ||
pThis[ i ]-GetParamCount() != pOther[ i ]-GetParamCount() )
{
-fprintf( stderr, Incompatible type, op-code or param counts\n );
+//fprintf( stderr, Incompatible type, op-code or param counts\n
);
return NULL;
}
switch( pThis[ i ]-GetType() )
@@ -1758,32 +1755,33 @@ ScSimilarFormulaDelta *ScFormulaCell::BuildDeltaTo(
ScFormulaCell *pOtherCell )
case formula::svMatrix:
case formula::svExternalSingleRef:
case formula::svExternalDoubleRef:
-fprintf( stderr, Ignoring matrix and external references for
now\n );
+//fprintf( stderr, Ignoring matrix and external references for
now\n );
return NULL;
default:
break;
}
}
-fprintf( stderr, matching formulae !\n );
ScSimilarFormulaDelta *pDelta = new ScSimilarFormulaDelta();
for ( sal_uInt16 i = 0; i pThisLen; i++ )
{
-if ( pThis[i]-GetType() != formula::svSingleRef
- pThis[i]-GetType() != formula::svDoubleRef )
-continue;
-
ScToken *pThisTok = static_cast ScToken * ( pThis[ i ] );
ScToken *pOtherTok = static_cast ScToken * ( pOther[ i ] );
-const ScSingleRefData aThisRef = pThisTok-GetSingleRef();
-const ScSingleRefData aOtherRef = pOtherTok-GetSingleRef();
-pDelta-push_delta( aThisRef, aOtherRef );
-
-const ScSingleRefData aThisRef2 = pThisTok-GetSingleRef2();
-const ScSingleRefData aOtherRef2 = pOtherTok-GetSingleRef2();
-pDelta-push_delta( aThisRef2, aOtherRef2 );
+if ( pThis[i]-GetType() == formula::svSingleRef ||
+ pThis[i]-GetType() == formula::svDoubleRef )
+{
+const ScSingleRefData aThisRef = pThisTok-GetSingleRef();
+const ScSingleRefData aOtherRef = pOtherTok-GetSingleRef();
+pDelta-push_delta( aThisRef, aOtherRef );
+}
+if ( pThis[i]-GetType() == formula::svDoubleRef )
+{
+const ScSingleRefData aThisRef2 = pThisTok-GetSingleRef2();
+const ScSingleRefData aOtherRef2 = pOtherTok-GetSingleRef2();
+pDelta-push_delta( aThisRef2, aOtherRef2 );
+}
}
return pDelta;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 4853fe94..ee38f0f 100644
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fldbas.hxx |2 ++
sw/source/core/fields/fldbas.cxx | 15 +++
sw/source/core/layout/trvlfrm.cxx |4 ++--
sw/source/ui/wrtsh/wrtsh2.cxx |2 ++
4 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit e76e2c4ce76457e518b007b970e1b0c2742f8d6e
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Mar 19 14:25:39 2013 +0100
add SwField::IsClickable and use it from SwWrtShell and SwPageFrm
Change-Id: I3d856dc11297b2ad73859ff9c2d529e8cd4727b2
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index c8e9fd7..55834ff 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -343,6 +343,8 @@ public:
voidSetAutomaticLanguage(sal_Bool
bSet){bIsAutomaticLanguage = bSet;}
virtual String GetDescription() const;
+/// Is this field clickable?
+bool IsClickable() const;
};
inline SwFieldType* SwField::GetTyp() const
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 8134348..9353219 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -756,6 +756,21 @@ String SwField::GetDescription() const
return SW_RES(STR_FIELD);
}
+bool SwField::IsClickable() const
+{
+switch (Which())
+{
+case RES_JUMPEDITFLD:
+case RES_MACROFLD:
+case RES_GETREFFLD:
+case RES_INPUTFLD:
+case RES_SETEXPFLD:
+case RES_DROPDOWN:
+return true;
+}
+return false;
+}
+
sal_uInt16 SwFldTypes::GetPos(const SwFieldType* pFieldType) const
{
const_iterator it = std::find(begin(), end(), pFieldType);
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index a1ace40..8f4f0be 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -294,7 +294,7 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
}
bool bConsiderBackground = true;
-// If the text position if a macro field, then that should have
priority.
+// If the text position is a clickable field, then that should
have priority.
if (pTextNd-IsTxtNode())
{
SwTxtNode* pTxtNd = pTextNd-GetTxtNode();
@@ -302,7 +302,7 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
if (pTxtAttr)
{
const SwField* pField = pTxtAttr-GetFld().GetFld();
-if (pField-Which() == RES_MACROFLD)
+if (pField-IsClickable())
bConsiderBackground = false;
}
}
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 74d4537..335f01c 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -315,6 +315,8 @@ void SwWrtShell::ClickToField( const SwField rFld )
case RES_DROPDOWN :
StartDropDownFldDlg( (SwField*)rFld, sal_False );
break;
+default:
+SAL_WARN_IF(rFld.IsClickable(), sw, unhandled clickable field!);
}
bIsInClickToEdit = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |3 +++
vcl/unx/gtk/fpicker/SalGtkPicker.cxx |3 +++
2 files changed, 6 insertions(+)
New commits:
commit e8504d9737ba0306ab8bcde9fcd8f50fdf30d33f
Author: GergÅ Mocsi gmocs...@gmail.com
Date: Mon Feb 25 15:46:08 2013 +0100
handle the empty URL case in file picker
Some extensions in the wild, for example Impress Photo Album Creator,
manage to call the file picker dialog with an empty URL. The resulting
error message is not very helpful: Operation not supported dialog.
Therefore we assign a default URL when empty URL is passed.
Change-Id: Icf71142411a79e1fe2d1d5918d2a400b174acc00
Reviewed-on: https://gerrit.libreoffice.org/2390
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 45fe125..d950dd8 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -78,6 +78,9 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const
rtl::OUString aDir
OSL_ASSERT( m_pDialog != NULL );
OString aTxt = unicodetouri( aDirectory );
+if( aTxt.isEmpty() ){
+ aTxt = unicodetouri(OUString(file:///.));
+}
if( !aTxt.isEmpty() aTxt.lastIndexOf('/') == aTxt.getLength() - 1 )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 236a0df..b4c08b5 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -217,6 +217,9 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const
rtl::OUString aDirec
OSL_ASSERT( m_pDialog != NULL );
OString aTxt = unicodetouri(aDirectory);
+if( aTxt.isEmpty() ){
+ aTxt = unicodetouri(OUString(file:///.));
+}
if( aTxt.lastIndexOf('/') == aTxt.getLength() - 1 )
aTxt = aTxt.copy( 0, aTxt.getLength() - 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] handle the empty URL case in file picker
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2390 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2390 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf71142411a79e1fe2d1d5918d2a400b174acc00 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#46808, Adapt UNO services to the new style, Part 1
Andras Timar has abandoned this change. Change subject: fdo#46808, Adapt UNO services to the new style, Part 1 .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/2145 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic44fc44d3c52ccc8db5d0b0917cb98ebae061eae Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/tool/token.cxx | 31 +--
1 file changed, 17 insertions(+), 14 deletions(-)
New commits:
commit 11c4471b68c1830134daf81f8aea0cc9b3dd9b59
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Mar 19 09:40:43 2013 -0400
Tweak hash generation code to NOT rely on 'i' to shift bits.
Because 'i' can get very large.
Change-Id: I1c7fcafaa60b14f709861f32c56defc7bcaee451
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 6368ba7..85d6e9a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1386,45 +1386,48 @@ void ScTokenArray::GenHash()
{
// Constant value.
sal_uInt8 nVal = p-GetByte();
-nHash += (static_castsize_t(nVal) i);
-continue;
+nHash += static_castsize_t(nVal);
}
+break;
case svDouble:
{
// Constant value.
double fVal = p-GetDouble();
-nHash += (static_castsize_t(fVal) i);
-continue;
+nHash += static_castsize_t(fVal);
}
+break;
case svString:
{
// Constant string.
const String rStr = p-GetString();
-nHash += (aHasher(rStr) i);
-continue;
+nHash += aHasher(rStr);
}
+break;
case svSingleRef:
{
size_t nVal = HashSingleRef(p-GetSingleRef());
-nHash += (nVal i);
-continue;
+nHash += nVal;
}
+break;
case svDoubleRef:
{
const ScComplexRefData rRef = p-GetDoubleRef();
size_t nVal1 = HashSingleRef(rRef.Ref1);
size_t nVal2 = HashSingleRef(rRef.Ref2);
-nHash += (nVal1 i);
-nHash += (nVal2 i);
-continue;
+nHash += nVal1;
+nHash += nVal2;
}
+break;
default:
-;
+// Use the opcode value in all the other cases.
+nHash += static_castsize_t(eOp);
}
}
+else
+// Use the opcode value in all the other cases.
+nHash += static_castsize_t(eOp);
-// Use the opcode value in all the other cases.
-nHash += (static_castsize_t(eOp) i);
+nHash = (nHash 4) - nHash;
}
mnHashValue = nHash;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - unotools/source
unotools/source/config/lingucfg.cxx | 39 +++-
1 file changed, 12 insertions(+), 27 deletions(-)
New commits:
commit a2d33e2d4cda5e2c4217403bfe94ec0b89d47202
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 19 14:44:01 2013 +0100
compareToAscii(RTL_CONSTASCII_STRINGPARAM(s)) != compareTo(s)
...broken with 407b51db1831bb2cf21def88241323e35c612005 Remove
RTL_CONSTASCII_STRINGPARAM (unotools).
Change-Id: Id810c157a6e10380d28e4d6e85f908dc79cf0057
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index e665ccd..f0e8d13 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -938,7 +938,7 @@ static bool lcl_GetFileUrlFromOrigin(
if (!rOrigin.isEmpty())
{
OUString aURL( rOrigin );
-if ( aURL.compareTo( EXPAND_PROTOCOL ) == 0 )
+if ( aURL.startsWith( EXPAND_PROTOCOL ) )
{
// cut protocol
OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) );
@@ -949,7 +949,7 @@ static bool lcl_GetFileUrlFromOrigin(
comphelper::getProcessComponentContext() )-expandMacros(
aMacro );
-bool bIsFileUrl = aURL.compareTo( FILE_PROTOCOL ) == 0;
+bool bIsFileUrl = aURL.startsWith( FILE_PROTOCOL );
if (bIsFileUrl)
{
rFileUrl = aURL;
commit 61e0ce089d2cff59c4144c05263cf6e83a92fd76
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 19 14:38:29 2013 +0100
DBG_ASSERT - SAL_WARN
Change-Id: I29a13ac9631027d7c527c3b395d4a887c290acc7
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index f5317f0..e665ccd 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -957,12 +957,14 @@ static bool lcl_GetFileUrlFromOrigin(
}
else
{
-DBG_ASSERT( bIsFileUrl, not a file URL);
+SAL_WARN(
+unotools.config, not a file URL, aURL );
}
}
else
{
-DBG_ASSERT( 0, failed to get file URL );
+SAL_WARN(
+unotools.config, failed to get file URL, aURL
);
}
}
return bSuccess;
commit 3968f5e874038ddfdcf70080ba6f122a48753b60
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 19 14:34:52 2013 +0100
Simply obtain theMacroExpander on demand
Change-Id: I919c8f5c26d1c879dd77e691babaa4eb7f608c35
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index 517a6ca..f5317f0 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -930,39 +930,24 @@ sal_Bool SvtLinguConfig::GetSupportedDictionaryFormatsFor(
return bSuccess;
}
-static uno::Reference util::XMacroExpander lcl_GetMacroExpander()
-{
-static uno::WeakReference util::XMacroExpander aG_xMacroExpander;
-
-uno::Reference util::XMacroExpander xMacroExpander( aG_xMacroExpander );
-if ( !xMacroExpander.is() )
-{
-aG_xMacroExpander = util::theMacroExpander::get(
comphelper::getProcessComponentContext() );
-xMacroExpander = aG_xMacroExpander;
-}
-
-return xMacroExpander;
-}
-
-
static bool lcl_GetFileUrlFromOrigin(
OUString /*out*/ rFileUrl,
-const OUString rOrigin,
-uno::Reference util::XMacroExpander rxMacroExpander )
+const OUString rOrigin )
{
bool bSuccess = false;
if (!rOrigin.isEmpty())
{
OUString aURL( rOrigin );
-if (( aURL.compareTo( EXPAND_PROTOCOL ) == 0 )
-rxMacroExpander.is() )
+if ( aURL.compareTo( EXPAND_PROTOCOL ) == 0 )
{
// cut protocol
OUString aMacro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) );
// decode uric class chars
aMacro = Uri::decode( aMacro, rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8 );
// expand macro string
-aURL = rxMacroExpander-expandMacros( aMacro );
+aURL = util::theMacroExpander::get(
+comphelper::getProcessComponentContext() )-expandMacros(
+aMacro );
bool bIsFileUrl = aURL.compareTo( FILE_PROTOCOL ) == 0;
if (bIsFileUrl)
@@ -1013,11 +998,10 @@ sal_Bool SvtLinguConfig::GetDictionaryEntry(
if (bSuccess)
{
// get file URL's for the locations
-uno::Reference util::XMacroExpander xMacroExpander(
lcl_GetMacroExpander() );
for (sal_Int32 i = 0; i aLocations.getLength(); ++i)
{
rtl::OUString rLocation = aLocations[i];
-if (!lcl_GetFileUrlFromOrigin( rLocation, rLocation,
xMacroExpander ))
+if (!lcl_GetFileUrlFromOrigin( rLocation, rLocation ))
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Deliver.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 93024b55d2e7d7a4bfa71e7a21b309c2e5aac31f Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 14:38:58 2013 +0100 fix race condition when using hardlinks to deliver into solver We need to use touch --no-dereference on the delivered files. Otherwise, it creates empty target file when you touch symlinks and delivering the real target file might fail. This caused many build failures when delivering: liblcms2.so - liblcms2.so.2.0.4 liblcms2.so.2 - liblcms2.so.2.0.4 liblcms2.so.2.0.4 Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 0f257e5..ab56dab 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch --no-dereference -r $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild
solenv/gbuild/Deliver.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e260bd6d6e341b24dc5094b3657047e5fdb406c6 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 14:38:58 2013 +0100 fix race condition when using hardlinks to deliver into solver We need to use touch --no-dereference on the delivered files. Otherwise, it creates empty target file when you touch symlinks and delivering the real target file might fail. This caused many build failures when delivering: liblcms2.so - liblcms2.so.2.0.4 liblcms2.so.2 - liblcms2.so.2.0.4 liblcms2.so.2.0.4 Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 Reviewed-on: https://gerrit.libreoffice.org/2840 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 0f257e5..ab56dab 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch --no-dereference -r $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/app/gensys.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7cd539319943f43b6f66b72ad85ecc0012d3e007
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 19 14:59:27 2013 +0100
Fix broken automatic search/replace results
Change-Id: Ic6985d2cf9d884763aaffc17361243b99b23ba17
diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx
index 75e8d5c..55b0d8d 100644
--- a/vcl/generic/app/gensys.cxx
+++ b/vcl/generic/app/gensys.cxx
@@ -191,7 +191,7 @@ const char* SalGenericSystem::getFrameClassName()
{
OUString aIni, aProduct;
rtl::Bootstrap::get( BRAND_BASE_DIR, aIni );
-aIni += /program/) + SAL_CONFIGFILE( bootstrap;
+aIni += /program/ + SAL_CONFIGFILE( bootstrap );
rtl::Bootstrap aBootstrap( aIni );
aBootstrap.getFrom( ProductKey, aProduct );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fix race condition when using hardlinks to deliver into solv...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2840 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/2840/1 fix race condition when using hardlinks to deliver into solver We need to use touch --no-dereference on the delivered files. Otherwise, it creates empty target file when you touch symlinks and delivering the real target file might fail. This caused many build failures when delivering: liblcms2.so - liblcms2.so.2.0.4 liblcms2.so.2 - liblcms2.so.2.0.4 liblcms2.so.2.0.4 Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 --- M solenv/gbuild/Deliver.mk 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 0f257e5..ab56dab 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch --no-dereference -r $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) -- To view, visit https://gerrit.libreoffice.org/2840 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fix race condition when using hardlinks to deliver into solv...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2840 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2840 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
connectivity/source/drivers/postgresql/pq_xkeys.cxx: compareToAscii - operator== sound?
commit c69436f7b76237f2b99a29737dc897fb0a86bfd7
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Sat Jan 19 10:08:21 2013 -0200
fdo#57950: Remove some chained appends in connectivity and..
... remove some RTL* macros.
Change-Id: I919d17e14334c9220b47775355512df8dfa00bca
Reviewed-on: https://gerrit.libreoffice.org/1768
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index 314924d..2a8d521 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -127,58 +126,17 @@ static sal_Int32 string2keytype( const rtl::OUString
type )
static sal_Int32 string2keyrule( const rtl::OUString rule )
{
sal_Int32 ret = com::sun::star::sdbc::KeyRule::NO_ACTION;
-if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( r ) ) == 0 )
+if( rule == r )
ret = com::sun::star::sdbc::KeyRule::RESTRICT;
-else if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( c ) ) == 0 )
+else if( rule == c )
ret = com::sun::star::sdbc::KeyRule::CASCADE;
-else if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( n ) ) == 0 )
+else if( rule == n )
ret = com::sun::star::sdbc::KeyRule::SET_NULL;
-else if( rule.compareToAscii( RTL_CONSTASCII_STRINGPARAM( d ) ) == 0 )
+else if( rule == d )
ret = com::sun::star::sdbc::KeyRule::SET_DEFAULT;
return ret;
}
smells like an incorrect conversion from
rtl::OUString::compareToAscii(asciiStr,maxLength) to operator== rather
than rtl::OUString::startsWith, but then again, given the preceeding
static sal_Int32 string2keytype( const rtl::OUString type )
{
sal_Int32 ret = com::sun::star::sdbcx::KeyType::UNIQUE;
if ( type == p )
ret = com::sun::star::sdbcx::KeyType::PRIMARY;
else if ( type == f )
ret = com::sun::star::sdbcx::KeyType::FOREIGN;
return ret;
}
I'm not really sure.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - cppcanvas/source
cppcanvas/source/inc/implrenderer.hxx| 12 ++
cppcanvas/source/inc/outdevstate.hxx | 126 +++
cppcanvas/source/mtfrenderer/emfplus.cxx | 49 ++
cppcanvas/source/mtfrenderer/outdevstate.hxx | 126 ---
4 files changed, 184 insertions(+), 129 deletions(-)
New commits:
commit af837e0fd656859e6c0a11020ea3556bfe984d06
Author: Radek Doulik r...@novell.com
Date: Tue Mar 19 13:17:42 2013 +0100
implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeRestore records
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
(cherry picked from commit 5a86702e13b3654982f1ee84da981d7fb8c442c5)
Change-Id: Iac87870c0f50a74b7f4db4c674adcded1494c055
Reviewed-on: https://gerrit.libreoffice.org/2839
Reviewed-by: Noel Power noel.po...@suse.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index c2902d6..4537368 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -28,8 +28,10 @@
#include canvasgraphichelper.hxx
#include action.hxx
+#include outdevstate.hxx
#include vector
+#include map
class GDIMetaFile;
class VirtualDevice;
@@ -166,6 +168,12 @@ static float GetSwapFloat( SvStream rSt )
}
};
+// EMF+
+typedef struct {
+XForm aWorldTransform;
+OutDevState aDevState;
+} EmfPlusGraphicState;
+
class ImplRenderer : public virtual Renderer, protected
CanvasGraphicHelper
{
public:
@@ -278,7 +286,6 @@ static float GetSwapFloat( SvStream rSt )
sal_Int32 nOriginY;
sal_Int32 nHDPI;
sal_Int32 nVDPI;
-::PolyPolygon aClippingPolygon;
/* EMF+ emf header info */
sal_Int32 nFrameLeft;
sal_Int32 nFrameTop;
@@ -292,6 +299,9 @@ static float GetSwapFloat( SvStream rSt )
boolmbMultipart;
sal_uInt16 mMFlags;
SvMemoryStream mMStream;
+/* emf+ graphic state stack */
+::std::mapint,EmfPlusGraphicState mGSStack;
+typedef ::std::mapint,EmfPlusGraphicState::iterator EPGSSIter;
};
diff --git a/cppcanvas/source/inc/outdevstate.hxx
b/cppcanvas/source/inc/outdevstate.hxx
new file mode 100644
index 000..26e1026
--- /dev/null
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -0,0 +1,126 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef _CPPCANVAS_OUTDEVSTATE_HXX
+#define _CPPCANVAS_OUTDEVSTATE_HXX
+
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/Sequence.hxx
+
+#include com/sun/star/rendering/StringContext.hpp
+#include com/sun/star/rendering/RenderState.hpp
+#include com/sun/star/rendering/XPolyPolygon2D.hpp
+#include com/sun/star/rendering/XCanvasFont.hpp
+#include com/sun/star/rendering/TextDirection.hpp
+#include basegfx/matrix/b2dhommatrix.hxx
+#include basegfx/polygon/b2dpolypolygon.hxx
+#include vcl/fntstyle.hxx
+#include vcl/vclenum.hxx
+#include vcl/outdev.hxx
+
+
+namespace cppcanvas
+{
+namespace internal
+{
+struct OutDevState
+{
+OutDevState() :
+clip(),
+clipRect(),
+xClipPoly(),
+
+lineColor(),
+fillColor(),
+textColor(),
+textFillColor(),
+textLineColor(),
+
+xFont(),
+transform(),
+mapModeTransform(),
+fontRotation(0.0),
+
+textEmphasisMarkStyle(EMPHASISMARK_NONE),
+pushFlags(PUSH_ALL),
+
textDirection(::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
+textAlignment(0), // TODO(Q2): Synchronize with implrenderer
+
[PUSHED libreoffice-4-0-2] implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeResto...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2839 Approvals: Noel Power: Looks good to me, but someone else must approve Michael Meeks: Looks good to me, but someone else must approve Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2839 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac87870c0f50a74b7f4db4c674adcded1494c055 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-2 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/app/gensys.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7b0d4848e6cd67b33cf86c06582225cd1c5fbb9d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 19 15:25:44 2013 +0100
Fix previous fix
Change-Id: Ia0739c4c45cb9f1d7474c08657a17b68ec5ef45a
diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx
index 55b0d8d..68d2192 100644
--- a/vcl/generic/app/gensys.cxx
+++ b/vcl/generic/app/gensys.cxx
@@ -191,7 +191,7 @@ const char* SalGenericSystem::getFrameClassName()
{
OUString aIni, aProduct;
rtl::Bootstrap::get( BRAND_BASE_DIR, aIni );
-aIni += /program/ + SAL_CONFIGFILE( bootstrap );
+aIni += /program/ SAL_CONFIGFILE( bootstrap );
rtl::Bootstrap aBootstrap( aIni );
aBootstrap.getFrom( ProductKey, aProduct );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxmenu.cxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 7f3837b743201a758ef09dc2c148f76eea5008f6 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Mar 19 15:30:44 2013 +0100 Fix broken string cleanup Change-Id: Ia33c4143d9ef070915c60361e472f032d22cd663 diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 6ea7cd6..3e5df7f 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -39,18 +39,18 @@ #define THROW_MENUITEM_NOT_FOUND( Func, nItemId ) \ if ( MENU_ITEM_NOTFOUND == mpMenu-GetItemPos( nItemId ) ) \ throw ::com::sun::star::container::NoSuchElementException( \ -OUString( Func ) \ -+= : There is no menu item with \ -+= OUString::valueOf( sal_Int32( nItemId ) ) \ -+= as identifier, \ +Func \ +: There is no menu item with \ ++ OUString::valueOf( sal_Int32( nItemId ) ) \ ++ as identifier, \ *this \ ); #define THROW_MENUPOS_NOT_FOUND( Func, nPos ) \ if ( MENU_ITEM_NOTFOUND == sal_uInt16( nPos ) ) \ throw ::com::sun::star::container::NoSuchElementException( \ -OUString( Func ) \ -+= : There is no menu item at position \ -+= OUString::valueOf( sal_Int32( nPos ) ), \ +Func \ +: There is no menu item at position \ ++ OUString::valueOf( sal_Int32( nPos ) ), \ *this \ ); #else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #128 from V Stuart Foote vstuart.fo...@utsa.edu --- Michale Meeks added bug 60769, -- FILEOPEN, FILESAVE, Could not save document, error in writing sub document context.xml then corrupt file. But that looks to be same issue as bug 60588 and bug 61033--both listed as unconfirmed but with additional detail. Comment 3 in 60588 suggests this may have been improved with 4.0.2.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
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/inc sw/source
sw/inc/fldbas.hxx |2 ++
sw/source/core/fields/fldbas.cxx | 15 +++
sw/source/core/layout/trvlfrm.cxx | 19 ++-
sw/source/ui/wrtsh/wrtsh2.cxx |2 ++
4 files changed, 37 insertions(+), 1 deletion(-)
New commits:
commit df3ec1cd965bc6f34846cd86f303f3473e672031
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Mar 19 13:41:19 2013 +0100
bnc#802888 SwPageFrm: let macro fields have priority over background objects
The intention is to get similar behavior as
61f467c8974d6b6face41e7027d75ae4ddb6fdb2, except this applies to single
clicks, while that one affected only double-click.
Change-Id: Idddc26aa8cd064f89fb4f99b3ad7a5430ac455bc
(cherry picked from commits a996678ed30804e16103e1cfdc439c8546e5d3b0 and
e76e2c4ce76457e518b007b970e1b0c2742f8d6e)
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 93c7495..a3280f8 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -352,6 +352,8 @@ public:
voidSetAutomaticLanguage(sal_Bool
bSet){bIsAutomaticLanguage = bSet;}
virtual String GetDescription() const;
+/// Is this field clickable?
+bool IsClickable() const;
};
inline SwFieldType* SwField::GetTyp() const
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 2a693ea..9364533 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -764,6 +764,21 @@ String SwField::GetDescription() const
return SW_RES(STR_FIELD);
}
+bool SwField::IsClickable() const
+{
+switch (Which())
+{
+case RES_JUMPEDITFLD:
+case RES_MACROFLD:
+case RES_GETREFFLD:
+case RES_INPUTFLD:
+case RES_SETEXPFLD:
+case RES_DROPDOWN:
+return true;
+}
+return false;
+}
+
sal_uInt16 SwFldTypes::GetPos(const SwFieldType* pFieldType) const
{
const_iterator it = std::find(begin(), end(), pFieldType);
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index ee907cd..0fa03e1 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -61,6 +61,9 @@
#include dcontact.hxx
// OD 2004-05-24 #i28701#
#include sortedobjs.hxx
+#include txatbase.hxx
+#include fmtfld.hxx
+#include fldbas.hxx
// FLT_MAX
#include cfloat
@@ -301,10 +304,24 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
bValidTextDistance = true;
}
+bool bConsiderBackground = true;
+// If the text position is a clickable field, then that should
have priority.
+if (pTextNd-IsTxtNode())
+{
+SwTxtNode* pTxtNd = pTextNd-GetTxtNode();
+SwTxtAttr* pTxtAttr =
pTxtNd-GetTxtAttrForCharAt(aTextPos.nContent.GetIndex(), RES_TXTATR_FIELD);
+if (pTxtAttr)
+{
+const SwField* pField = pTxtAttr-GetFld().GetFld();
+if (pField-IsClickable())
+bConsiderBackground = false;
+}
+}
+
double nBackDistance = 0;
bool bValidBackDistance = false;
SwCntntNode* pBackNd = aBackPos.nNode.GetNode( ).GetCntntNode( );
-if ( pBackNd )
+if ( pBackNd bConsiderBackground)
{
// FIXME There are still cases were we don't have the proper
node here.
SwCntntFrm* pBackFrm = pBackNd-getLayoutFrm( getRootFrm( ) );
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 16196cc..4d180b5 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -307,6 +307,8 @@ void SwWrtShell::ClickToField( const SwField rFld )
case RES_DROPDOWN :
StartDropDownFldDlg( (SwField*)rFld, sal_False );
break;
+default:
+SAL_WARN_IF(rFld.IsClickable(), sw, unhandled clickable field!);
}
bIsInClickToEdit = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source solenv/bin
i18npool/source/isolang/langid.pl |6 -
solenv/bin/modules/installer.pm | 33
solenv/bin/modules/installer/languages.pm | 99
solenv/bin/modules/installer/windows/feature.pm |3
4 files changed, 20 insertions(+), 121 deletions(-)
New commits:
commit 38fb0462578bde685e3862187a2dc842968d8f72
Author: Andras Timar ati...@suse.com
Date: Tue Mar 19 07:52:45 2013 -0700
fdo#54278 Only en-US help pack should contain en-US help
Language of the installer and language of the installed help files are two
separate things. It was not good that they were handled in the same array.
Now all help packs has English + localized installer.
Only en.US help pack isntalls en-US help.
Also, maintaning the list of languages, that are not supported by Windows,
is pointless. What Windows? Windows 8 supports a lot more than Windows XP.
Change-Id: I075a18648796a42609329ead9e8e6a9da9c1fef3
diff --git a/i18npool/source/isolang/langid.pl
b/i18npool/source/isolang/langid.pl
index 78221b5..b57c936 100755
--- a/i18npool/source/isolang/langid.pl
+++ b/i18npool/source/isolang/langid.pl
@@ -397,12 +397,6 @@ sub main()
# needs a duplicated pair of backslashes to produce a literal
\\
('^\s*completelangiso\s*=', '^\s*$', '^\s*' . $langcoun .
'\s**$'));
-# @noMSLocaleLangs = ( br, bs, ... )
-grepFile(
-
'^\s*@noMSLocaleLangs\s*=\s*\(\s*(\s*([a-z]{2,3})(-[A-Z][A-Z])?\s*,?)*' .
$langcoun . '',
-$SRC_ROOT, solenv, bin/modules/installer/languages.pm,
-('^\s*@noMSLocaleLangs\s*=', '\)\s*$', '' . $langcoun . ''));
-
# af1252 1078 # Afrikaans
grepFile(
'^\s*' . $langcoun . '',
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index fdf9370..c731d9e 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -424,6 +424,7 @@ sub run {
for ( my $n = 0; $n = $#installer::globals::languageproducts; $n++ )
{
my $languagesarrayref =
installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n],
$allvariableshashref);
+my @setuplanguagesarray = @{ $languagesarrayref };
my $languagestringref =
installer::languages::get_language_string($languagesarrayref);
installer::logger::print_message(
\n );
@@ -441,6 +442,8 @@ sub run {
$installer::globals::addsystemintegration = 0;
$installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
+@setuplanguagesarray = grep { $_ ne en-US } @setuplanguagesarray;
+unshift(@setuplanguagesarray, en-US);
}
@@ -533,7 +536,7 @@ sub run {
# Resolving include paths (language dependent)
-$includepatharrayref_lang =
installer::ziplist::replace_languages_in_paths($includepatharrayref,
$languagesarrayref);
+$includepatharrayref_lang =
installer::ziplist::replace_languages_in_paths($includepatharrayref,
\@setuplanguagesarray);
if ( $installer::globals::refresh_includepaths ) {
installer::worker::collect_all_files_from_includepaths($includepatharrayref_lang);
}
@@ -1340,21 +1343,21 @@ sub run {
# Collection all available directory trees
installer::windows::directory::collectdirectorytrees($directoriesforepmarrayref);
-# Attention: The table Director.idt contains language specific
strings - parameter: $languagesarrayref !
-
installer::windows::directory::create_directory_table($directoriesforepmarrayref,
$languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname,
$loggingdir);
+# Attention: The table Director.idt contains language specific
strings - parameter: \@setuplanguagesarray !
+
installer::windows::directory::create_directory_table($directoriesforepmarrayref,
\@setuplanguagesarray, $newidtdir, $allvariableshashref, $shortdirname,
$loggingdir);
$filesinproductlanguageresolvedarrayref =
installer::windows::file::create_files_table($filesinproductlanguageresolvedarrayref,
$directoriesforepmarrayref, \@allfilecomponents, $newidtdir,
$allvariableshashref, $uniquefilename, $allupdatesequences,
$allupdatecomponents, $allupdatefileorder);
if ( $installer::globals::updatedatabase ) {
installer::windows::file::check_file_sequences($allupdatefileorder,
$allupdatecomponentorder); }
-# Attention: The table Registry.idt contains language specific
strings - parameter: $languagesarrayref !
-
Impress Sprint Dresden updates
Hi there, just a quick update on $subject - added some more bits and pieces to https://wiki.documentfoundation.org/Marketing/Events/ImpressSprint2013 , most importantly some rough time table at https://wiki.documentfoundation.org/Marketing/Events/ImpressSprint2013/Schedule and a list of talks / project proposal at https://wiki.documentfoundation.org/Marketing/Events/ImpressSprint2013/Proposals Your edits on those pages appreciated - please take the talks listed as offers for input, feel free to add your own pet project (either one you'd need some mentoring input for, or something you're happy to talk about)! I'll follow-up with the listed participants in a minute with more pointers to resources (build howto, QA pages etc). Looking forward to see you there, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 5a15b4a2f68124bb4cf462f354326f790b7b3643
Author: Petr Mladek pmla...@suse.cz
Date: Tue Mar 19 16:12:37 2013 +0100
bump product version to 3.6.6.1+, release number to 1
Change-Id: I29d7c1e2c75248459f536feb14cad0e6e84e71a7
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 00c1876..3798935 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 3.6.6.0
+UREPACKAGEVERSION 3.6.6.1
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@ LibreOffice
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .6.1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.6.0
+ABOUTBOXPRODUCTVERSION 3.6.6.1
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.6.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@ LibreOffice_Dev
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .6.1
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.6.0
+ABOUTBOXPRODUCTVERSION 3.6.6.1
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.6.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.6.1
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .6.1
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@ LibreOffice_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .6.1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.6.1
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .6.1
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.6.1
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@ LibreOffice_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .5.0
+SHORT_PRODUCTEXTENSION .6.1
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.6.0
+PACKAGEVERSION 3.6.6.1
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@ LibreOffice_Dev_Test
PRODUCTVERSION 3.6
PRODUCTEXTENSION
Re: #ifdef vs #if for feature checks
Hi Tor, *, On Tue, Mar 19, 2013 at 6:51 AM, Tor Lillqvist t...@iki.fi wrote: otoh, #pragma once is supported by all the compiler we use isn't it ? Excellent! Let's do that, unless somebody comes up with a counter-argument in a week or so. This doesn't help when the same file is used from two different locations, let's say from solver and the module (should not happen, but...) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template manager: moved the controls into a proper TabPage t...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2843
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2843/1
Template manager: moved the controls into a proper TabPage to avoid problems
Conflicts:
sfx2/inc/templatedlg.hxx
sfx2/source/doc/templatedlg.src
Change-Id: Ibff35bf24873a38c9a09d71fb3630a57e06f1a3c
---
M sfx2/inc/templatedlg.hxx
M sfx2/source/control/templateview.src
M sfx2/source/doc/doc.hrc
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/doc/templatedlg.src
5 files changed, 98 insertions(+), 74 deletions(-)
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 47c1989..095292e 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -15,6 +15,7 @@
#include vcl/dialog.hxx
#include vcl/button.hxx
#include vcl/tabctrl.hxx
+#include vcl/tabpage.hxx
class Edit;
class PopupMenu;
@@ -126,6 +127,7 @@
private:
TabControl maTabControl;
+TabPage maTabPage;
Control *mpToolbars;
Edit *mpSearchEdit;
diff --git a/sfx2/source/control/templateview.src
b/sfx2/source/control/templateview.src
index d2711a7..db4d575 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -11,7 +11,6 @@
Control CONTROL_BUTTONS
{
Size = MAP_APPFONT( 290, 17 );
-Border = True;
TabStop = False;
};
@@ -20,6 +19,7 @@
Pos = MAP_APPFONT( 1, 1 );
Size = MAP_APPFONT( 50, 14 );
Text [ en-US ] = All Templates;
+TabStop = True;
};
FixedText FT_NAME
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index f3edfa7..b56a473 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.hrc
@@ -39,6 +39,7 @@
#define DLG_DOC_TEMPLATE(RID_SFX_DOC_START+2)
#define DLG_ORGANIZE(RID_SFX_DOC_START+3)
#define DLG_TEMPLATE_MANAGER(RID_SFX_DOC_START+4)
+#define TAB_TEMPLATE_MANAGER(RID_SFX_DOC_START+5)
#define BMP_STYLES_CLOSED (RID_SFX_DOC_START+ 0)
#define BMP_STYLES_OPENED (RID_SFX_DOC_START+ 1)
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7041966..1d52d45 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -99,22 +99,38 @@
OUString maKeyword;
};
+class TemplateManagerPage : public TabPage
+{
+private:
+FixedText maFixedText;
+
+public:
+TemplateManagerPage( Window* pParent );
+~TemplateManagerPage( ) { };
+};
+
SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
: ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
maTabControl(this,SfxResId(TAB_CONTROL)),
- mpToolbars( new Control(maTabControl,SfxResId(TOOLBARS))),
+ maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)),
+ mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))),
mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)),
mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
- mpSearchView(new TemplateSearchView(this)),
- maView(new TemplateLocalView(this,SfxResId(TEMPLATE_VIEW))),
- mpOnlineView(new TemplateRemoteView(this, WB_VSCROLL,false)),
+ mpSearchView(new TemplateSearchView(maTabPage)),
+ maView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
+ mpOnlineView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
mbIsSaveMode(false),
mxDesktop(comphelper::getProcessServiceFactory()-createInstance(
com.sun.star.frame.Desktop ),uno::UNO_QUERY ),
mbIsSynced(false),
maRepositories()
{
+maTabControl.SetTabPage( FILTER_DOCS, maTabPage );
+maTabControl.SetTabPage( FILTER_SHEETS, maTabPage );
+maTabControl.SetTabPage( FILTER_PRESENTATIONS, maTabPage );
+maTabControl.SetTabPage( FILTER_DRAWS, maTabPage );
+
// Create popup menus
mpActionMenu = new PopupMenu;
mpActionMenu-InsertItem(MNI_ACTION_SORT_NAME,SfxResId(STR_ACTION_SORT_NAME).toString(),SfxResId(IMG_ACTION_SORT));
@@ -293,20 +309,17 @@
Size aTabSize = maTabControl.GetSizePixel();
aTabSize.setWidth(aWinSize.getWidth());
maTabControl.SetSizePixel(aTabSize);
-Size aTabPageSize = maTabControl.GetTabPageSizePixel();
-Point aToolbarsPos(0, aTabSize.getHeight() - aTabPageSize.getHeight());
-mpToolbars-SetPosPixel(aToolbarsPos);
-aTabPageSize.setHeight(mpToolbars-GetSizePixel().getHeight() + 3);
-maTabControl.SetTabPageSizePixel(aTabPageSize);
-
-Size aToolbarsSize = mpToolbars-GetSizePixel();
-aToolbarsSize.setWidth(aWinSize.getWidth());
-mpToolbars-SetSizePixel(aToolbarsSize);
+maTabControl.SetTabPageSizePixel(aWinSize);
// Calculate toolboxes size and positions
Size aViewSize =
[PATCH libreoffice-4-0] Template Manager: fixed TabStops for the toolbars
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2845
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2845/1
Template Manager: fixed TabStops for the toolbars
Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650
(cherry picked from commit eff94128b8434501a6f9c26a5a47cfd7d408f472)
---
M sfx2/inc/templatedlg.hxx
M sfx2/source/doc/templatedlg.cxx
M sfx2/source/doc/templatedlg.src
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 095292e..0d7eb78 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -128,7 +128,6 @@
TabControl maTabControl;
TabPage maTabPage;
-Control *mpToolbars;
Edit *mpSearchEdit;
ToolBox *mpViewBar;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index f0a16b35..e9f85eb 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -113,11 +113,10 @@
: ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
maTabControl(this,SfxResId(TAB_CONTROL)),
maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)),
- mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))),
mpSearchEdit(new Edit(maTabPage,WB_HIDE | WB_BORDER)),
- mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))),
- mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))),
- mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))),
+ mpViewBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_VIEW))),
+ mpActionBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_ACTION))),
+ mpTemplateBar( new ToolBox(maTabPage, SfxResId(TBX_ACTION_TEMPLATES))),
mpSearchView(new TemplateSearchView(maTabPage)),
maView(new TemplateLocalView(maTabPage,SfxResId(TEMPLATE_VIEW))),
mpOnlineView(new TemplateRemoteView(maTabPage, WB_VSCROLL,false)),
@@ -239,7 +238,6 @@
delete mpTemplateDefaultMenu;
delete mpActionMenu;
delete mpRepositoryMenu;
-delete mpToolbars;
}
void SfxTemplateManagerDlg::setSaveMode(bool bMode)
@@ -318,9 +316,6 @@
long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(),
aActionSize.getHeight()), aTemplateSize.getHeight());
-Size aToolbarsSize (aWinSize.getWidth(), nToolbarsHeight);
-mpToolbars-SetSizePixel(aToolbarsSize);
-
aActionSize.setWidth(3*aActionSize.getWidth());
aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar-GetPosPixel().X());
aTemplateSize.setWidth(aWinSize.getWidth());
@@ -334,7 +329,7 @@
// Set view position below toolbox
Point aViewPos = maView-GetPosPixel();
-aViewPos.setY(aToolbarsSize.getHeight());
+aViewPos.setY(nToolbarsHeight);
aViewPos.setX(0);
Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY());
maView-SetPosSizePixel(aViewPos, aThumbSize);
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 6928ef1..60c2857 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -106,12 +106,6 @@
Size = MAP_APPFONT( 290, 220 );
Hide = TRUE;
-Control TOOLBARS
-{
-Size = MAP_APPFONT( 290 , 20 );
-TabStop = False;
-};
-
Control TEMPLATE_VIEW
{
Pos = MAP_APPFONT( 0, 20 );
--
To view, visit https://gerrit.libreoffice.org/2845
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab2dd8ef71fd84e9d147d90e9cad46d69a8fe650
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Template Manager: fixed search edit field position
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2844 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/2844/1 Template Manager: fixed search edit field position Change-Id: Ic5ef64ba3ed4c98397b0c4911de491df4c79946a (cherry picked from commit b6ba04639b9922f6717f79ac4be215e09691d7a9) --- M sfx2/source/doc/templatedlg.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 1d52d45..f0a16b35 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -114,7 +114,7 @@ maTabControl(this,SfxResId(TAB_CONTROL)), maTabPage(maTabControl, SfxResId(TAB_TEMPLATE_MANAGER)), mpToolbars( new Control(maTabPage,SfxResId(TOOLBARS))), - mpSearchEdit(new Edit(this,WB_HIDE | WB_BORDER)), + mpSearchEdit(new Edit(maTabPage,WB_HIDE | WB_BORDER)), mpViewBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_VIEW))), mpActionBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_ACTION))), mpTemplateBar( new ToolBox(mpToolbars, SfxResId(TBX_ACTION_TEMPLATES))), -- To view, visit https://gerrit.libreoffice.org/2844 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic5ef64ba3ed4c98397b0c4911de491df4c79946a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/70a3d7c9df5d19b837a1b684fc44bf871e17d4
aa/70a3d7c9df5d19b837a1b684fc44bf871e17d4 |1 + 1 file changed, 1 insertion(+) New commits: commit c2b7dc858c33ae6c06e2a40d7c0c405d1cb25642 Author: Eike Rathke er...@redhat.com Date: Tue Mar 19 16:33:30 2013 +0100 Notes added by 'git notes add' diff --git a/aa/70a3d7c9df5d19b837a1b684fc44bf871e17d4 b/aa/70a3d7c9df5d19b837a1b684fc44bf871e17d4 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/aa/70a3d7c9df5d19b837a1b684fc44bf871e17d4 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: #ifdef vs #if for feature checks
On 19/03/13 16:25, Christian Lohmaier wrote: Hi Tor, *, On Tue, Mar 19, 2013 at 6:51 AM, Tor Lillqvist t...@iki.fi wrote: otoh, #pragma once is supported by all the compiler we use isn't it ? Excellent! Let's do that, unless somebody comes up with a counter-argument in a week or so. This doesn't help when the same file is used from two different locations, let's say from solver and the module (should not happen, but...) we want to kill the delivering of headers anyway, so (with possible exception of URE headers) this problem will go away if it even exists now. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: #ifdef vs #if for feature checks
On Tue, Mar 19, 2013 at 10:25 AM, Christian Lohmaier lohmaier+libreoff...@googlemail.com wrote: Hi Tor, *, On Tue, Mar 19, 2013 at 6:51 AM, Tor Lillqvist t...@iki.fi wrote: otoh, #pragma once is supported by all the compiler we use isn't it ? Excellent! Let's do that, unless somebody comes up with a counter-argument in a week or so. This doesn't help when the same file is used from two different locations, let's say from solver and the module (should not happen, but...) If that was possible, wouldn't that be a bug to be fixed ? (and it is becoming moot as we move away from delivering headers) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] use -isystem instead of -I for 3rd party headers
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2846 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/2846/1 use -isystem instead of -I for 3rd party headers This should avoid gcc warnings in external code we don't care about, so there'll be no need to fix them for WaE. Change-Id: I629dc2672c075908294609249183f27ad2984325 --- M RepositoryExternal.mk M config_host.mk.in M configure.ac 3 files changed, 64 insertions(+), 43 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a7042b1..75b862d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -99,7 +99,7 @@ define gb_LinkTarget__use_npapi_headers $(call gb_LinkTarget_use_package,$(1),npapi) $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/npsdk \ + $(ISYSTEM)$(OUTDIR)/inc/external/npsdk \ $$(INCLUDE) \ ) @@ -134,7 +134,7 @@ define gb_LinkTarget__use_vigra_headers $(call gb_LinkTarget_use_unpacked,$(1),vigra) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,vigra/include) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,vigra/include) \ $$(INCLUDE) \ ) @@ -151,7 +151,7 @@ define gb_LinkTarget__use_mdds_headers $(call gb_LinkTarget_use_unpacked,$(1),mdds) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,mdds/include) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,mdds/include) \ $$(INCLUDE) \ ) @@ -203,7 +203,7 @@ cppunit \ ) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cppunit/include)\ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,cppunit/include)\ $$(INCLUDE) \ ) @@ -274,8 +274,8 @@ ) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \ - -I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \ $$(INCLUDE) \ ) @@ -315,7 +315,7 @@ ) $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/zlib \ + $(ISYSTEM)system $(OUTDIR)/inc/external/zlib \ $$(INCLUDE) \ ) @@ -363,7 +363,7 @@ define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/jpeg \ + $(ISYSTEM)system $(OUTDIR)/inc/external/jpeg \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -430,7 +430,7 @@ $(if $(2),,$(error gb_LinkTarget__use_expat needs additional parameter)) $(call gb_LinkTarget_set_include,$(1),\ --I$(OUTDIR)/inc/external/expat \ +$(ISYSTEM)$(OUTDIR)/inc/external/expat \ $$(INCLUDE) \ ) @@ -481,7 +481,7 @@ define gb_LinkTarget__use_hyphen $(call gb_LinkTarget_use_unpacked,$(1),hyphen) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,hyphen)\ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,hyphen)\ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -515,7 +515,7 @@ ) $(call gb_LinkTarget_use_unpacked,$(1),hunspell) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -592,7 +592,7 @@ define gb_LinkTarget__use_boost_headers $(call gb_LinkTarget_use_unpacked,$(1),boost) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,boost) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,boost) \ $$(INCLUDE) \ ) @@ -673,7 +673,7 @@ ) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,exttextcat/src) \ $$(INCLUDE) \ ) @@ -710,7 +710,7 @@ ) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,xml2)/include \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xml2)/include \ ) endef @@ -754,7 +754,7 @@ $(call gb_LinkTarget_use_package,$(1),xslt) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,xslt) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xslt) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ xslt \ @@ -766,7 +766,7 @@ $(call gb_LinkTarget_use_package,$(1),xslt) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(call gb_UnpackedTarball_get_dir,xslt) \ + $(ISYSTEM)$(call gb_UnpackedTarball_get_dir,xslt) \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -804,7 +804,7 @@ define gb_LinkTarget__use_liblangtag $(call gb_LinkTarget_use_unpacked,$(1),langtag) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/methods.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 14d452d0c2874f47f0b6ac1cd1c725195d5d69a9
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Mar 19 15:43:07 2013 +
fix for fdo#62090 Mid function regression
Change-Id: Ia6a73d6a44a34345b512922037d01b8b40ac24a8
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5dc45ed..862f4d0 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1266,7 +1266,8 @@ RTLFUNC(Mid)
{
aResultStr = aArgStr;
aResultStr.remove( nStartPos, nLen );
-aResultStr.insert( nStartPos,
rPar.Get(4)-GetOUString().getStr(), nLen);
+//aResultStr.insert( nStartPos,
rPar.Get(4)-GetOUString().getStr(), nLen);
+aResultStr.insert( nStartPos,
rPar.Get(4)-GetOUString().getStr(), std::min(nLen,
rPar.Get(4)-GetOUString().getLength()));
}
rPar.Get(1)-PutString( aResultStr.makeStringAndClear() );
___
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' - 0b/a847a0875a454c0c581cbd1a062b94775b2115
0b/a847a0875a454c0c581cbd1a062b94775b2115 |1 + 1 file changed, 1 insertion(+) New commits: commit 49b8b8130391e214650a1f9c0d1346b6e92d Author: Eike Rathke er...@redhat.com Date: Tue Mar 19 16:46:25 2013 +0100 Notes added by 'git notes add' diff --git a/0b/a847a0875a454c0c581cbd1a062b94775b2115 b/0b/a847a0875a454c0c581cbd1a062b94775b2115 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/0b/a847a0875a454c0c581cbd1a062b94775b2115 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
questn wrt importing configurations2 from templateproject in global configuration
Hi, I've started working with an old Ms templateproject in an .dot Rewrote some of the VBA. Saved that as .odt. There is a toolbar with popup menu's. And the menu's do work and launch the script in the .odt file. (IIRC, creating a popup with the Addon.xcu in an extension is not possible.) As usual, the toolbar submenus are in Configurations2 in the documents xml file. Now I'm putting that into the global LibreOffice Writer configuration. Some works, some not. What I do: Putting the files in either /home/cono/LibreOffice/401rc2/libreoffice4.0/share/config/soffice.cfg/modules/swriter/... or /.config/libreoffice/401rc2/user/config/soffice.cfg/modules/swriter/ and renaming some elements menu:menuitem menu:id=vnd.sun.star.script:TemplateProject to menu:menuitem menu:id=vnd.sun.star.script:MacroLibraryName and location=document to location=application Now the script launched directly with a button on the toolbar do work. But the popupmenu's don't work. Can there be some difference in how the code handles configuration from a file and from the global/user configuration. (Yes, probably ;). Any advice would be appreciated. Cheers, -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Attempting to Build PUNO 0.9.0 against LibreOffice 3.4.x SDK
Attempting to build PUNO 0.9.0 (PHP connector for UNO) with the LibreOffice 3.4.x SDK, over from the OpenOffice 3.2 SDK. Theoretically it supports the 3.4.x SDK. I know I have had linker drama in the past with building this... but I can't find my @^$*@@( notes. Drats! Anwyay, tips, hinds, suggestions... # . /usr/lib64/libreoffice/basis3.4/sdk/setsdkenv_unix.sh # make distclean # export OO_PROGRAM_OFFAPI_RDB_PATH= $OFFICE_HOME/basis3.4/program/offapi.rdb # export OO_URE_TYPES_RDB_PATH=$OO_SDK_URE_HOME/share/misc/types.rdb # phpize # ./configure --with-puno=$OO_SDK_HOME ... checking for OpenOffice.org support... yes, shared checking for OpenOffice.org URE types.rdb ... /usr/lib64/libreoffice/ure/share/misc/types.rdb checking for OpenOffice.org PROGRAM offapi.rdb ... /usr/lib64/libreoffice/basis3.4/program/offapi.rdb ... # ls -l /usr/lib64/libreoffice/basis3.4/program/offapi.rdb -rw-r--r--. 1 root root 6698496 Aug 1 2012 /usr/lib64/libreoffice/basis3.4/program/offapi.rdb # ls -l /usr/lib64/libreoffice/ure/share/misc/types.rdb -rw-r--r--. 1 root root 831488 Aug 1 2012 /usr/lib64/libreoffice/ure/share/misc/types.rdb # cd $OO_SDK_URE_HOME/lib # for i in $(ls *.so?* ); do ln -s $i `echo $i | cut -f1 -d.`.so; done # cd /tmp/PUNO # make cppumaker mkdir -p /tmp/PUNO/modules rm -f /tmp/PUNO/modules/types.rdb /usr/lib64/libreoffice/ure/bin/regmerge /tmp/PUNO/modules/types.rdb / /usr/lib64/libreoffice/ure/share/misc/types.rdb /usr/lib64/libreoffice/basis3.4/program/offapi.rdb mkdir -p /tmp/PUNO/.libs/puno_automatic_generated/misc rm -f /tmp/PUNO/.libs/puno_automatic_generated/misc/cpp_types_prepare_env.flag Register necessary runtime components in the types.rdb /usr/lib64/libreoffice/ure/bin/regcomp -register -r /tmp/PUNO/modules/types.rdb -c connector.uno.so connector.uno.so register component 'connector.uno.so' in registry '/tmp/PUNO/modules/types.rdb' failed! error (CannotRegisterImplementationException): connector.uno.so: cannot get symbol: component_writeInfo make: *** [/tmp/PUNO/.libs/puno_automatic_generated/misc/cpp_types_prepare_env.flag] Error 1 -- Adam Tauno Williams GPG D95ED383 Systems Administrator, Python Developer, LPI / NCLA ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
return value of GetTextBreak()
Hi, GetTextBreak() returns STRING_LENGTH if text breaking isn't necessary (if I get it right). indexOf() returns -1 if searching failed. Would that be a choice for GetTextBreak() as well? What would be a useful return value? sal_Int16, sal_Int32? In GenericSalLayout int is chosen as return type. In OutputDevice xub_StrLen is chosen... Christina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
