Re: Unittest fails building on OS X 10.9
Hi, Yes, your section looks more up to date, than the section Minimal Setup. Great job you have done. Regards, Joost 2014-10-10 3:28 GMT+02:00 Robert Antoni Buj i Gelonch robert@gmail.com : Hi, I've added the section Minimal Setup with MacPorts for external dependencies [1] which can be very helpful to build LO easily. [1] https://wiki.documentfoundation.org/Development/BuildingOnMac#Minimal_Setup_with_MacPorts_for_external_dependencies Regards, Robert On Thu, Oct 9, 2014 at 9:38 PM, Joost Eekhoorn joost.eekho...@gmail.com wrote: Build has succeeded. I saw in this that --disable-cve-test is needed on OS X Mavericks Still I had to do 2 little, dirty hacks: - Moved away 4 CVE-test file from ~/lo/core/writerfilter/qa/cppunittest/data/pass/ (CVE-2010-333-1.rtf, CVE-2014-1761-1.rtf, CVE-2014-1761-2.rtf and CVS-pseudo-2009-0238-1.rtf) - Edited ~/lo/core/sw/qa/extras/rtfimport/rtfimport.cxx (skipping testN192129) Beside that, this is what I have done: Install Ant (OS X Mavericks does not have that anymore) ./autogen.sh --with-ant-home=/usr/local/bin/apache-ant --wiithout-junit --enable-python=internal --disable-cve-tests I could not found instdir/program/soffice to start the program, but used: instdir/LibreOfficeDev.app/Contents/MacOS/soffice It would be nice if someone would review my information and update the building instructions for Mac: https://wiki.documentfoundation.org/Development/BuildingOnMac ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Unittest fails building on OS X 10.9
What must I do, when a unit test fails? Why does that stops my build? This is the error message: [build CUT] hwpfilter_test_hwpfilter File tested,Test Result,Execution tools::Time (ms) ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2005-1544-1.tiff,Pass,4 ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2006-2656-1.tiff,Pass,5 ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2007-2217-1.tiff,Fail,101 ~/lo/core/unotest/source/cpp/filters-test.cxx:125:TiffFilterTest::testCVEs assertion failed - Expression: bRes == (nExpected == test::pass) - ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2007-2217-1.tiff ~/lo/core/unotest/source/cpp/filters-test.cxx:125: Assertion Test name: TiffFilterTest::testCVEs assertion failed - Expression: bRes == (nExpected == test::pass) - ~/lo/core/filter/qa/cppunit/data/tiff/pass/CVE-2007-2217-1.tiff Failures !!! Run: 1 Failure total: 1 Failures: 1 Errors: 0 2014-10-08 23:47:16.052 cppunittester[59255:507] *** -[NSAutoreleasePool release]: This pool has already been released, do not drain it (double release). Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_filter_tiff_test make[1]: *** [~/lo/core/workdir/CppunitTest/filter_tiff_test.test] Error 1 ---Joost--- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unittest fails building on OS X 10.9
Build has succeeded. I saw in this that --disable-cve-test is needed on OS X Mavericks Still I had to do 2 little, dirty hacks: - Moved away 4 CVE-test file from ~/lo/core/writerfilter/qa/cppunittest/data/pass/ (CVE-2010-333-1.rtf, CVE-2014-1761-1.rtf, CVE-2014-1761-2.rtf and CVS-pseudo-2009-0238-1.rtf) - Edited ~/lo/core/sw/qa/extras/rtfimport/rtfimport.cxx (skipping testN192129) Beside that, this is what I have done: Install Ant (OS X Mavericks does not have that anymore) ./autogen.sh --with-ant-home=/usr/local/bin/apache-ant --wiithout-junit --enable-python=internal --disable-cve-tests I could not found instdir/program/soffice to start the program, but used: instdir/LibreOfficeDev.app/Contents/MacOS/soffice It would be nice if someone would review my information and update the building instructions for Mac: https://wiki.documentfoundation.org/Development/BuildingOnMac ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Link error Python2.7 building on OS X 10.9
Hey all, I try to build on OS X 10.9.5 and get this link error at libpyuno.dylib: Library/libpyuno.dylib ld: library not found for -lpython2.7 clang: error: linker command failed with exit code 1 (use -v to see invocation) make[1]: *** [/Users/Joost/work/lo/core/instdir/LibreOfficeDev.app/Contents/Frameworks/libpyuno.dylib] Error 1 Maybe my local installation of Python 3.4 has to do with this problem? Joost ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PYTHON] DialogBox class for Python
I could not found a dialogbox class, thus I build one: class DialogBox in dialogbox.py. I did not look good enough. There is UnoDialog2.py in wizards/com/sun/star/wizards/ui. Thus dialogbox.py can go to /dev/null. Also the 2 examples. I made a new example using UnoDialog2: example-using-unodialog2.py. The header would have to be changed to the TEMPLATE.SOURCECODE.HEADER The attached new example has this header. Would the idea be to install it along with the rest of pyuno as utility class for reuse. Do not install dialogbox.py, because its is redundant. Just to be thrown away. or to just have it as a demo ? As a demo would be nice. Therefor a code review is needed and a demo context. Where is the place for such a demo ? Joost example-using-unodialog2.py Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PYTHON] DialogBox class for Python
I could not found a dialogbox class, thus I build one: class DialogBox in dialogbox.py. Also made 2 examples using this DialogBox: - example-using-dialog.py: showing a simple dialog and printing the results to the shell. - example-import-to-calc.py: importing data from a csv-file to a calc-sheet and making a graph. This is how I run these examples on my Ubuntu: - Open a xterm and export URE_BOOTSTRAP end PYTHONPATH (note: this is not good practice, but it works) -- For testing on my core: cd /home/joost/work/git/libo/install/program export URE_BOOTSTRAP=file:///home/joost/git/libo/install/program/fundamentalrc export PYTHONPATH=/home/joost/git/libo/install/program -- For testing on my installed LibreOffice: cd /usr/lib/libreoffice/program export URE_BOOTSTRAP=file:///usr/lib/libreoffice/program/fundamentalrc export PYTHONPATH=/usr/lib/libreoffice/basis-link/program - Run LibreOffice in listening mode: ./soffice --nodefault --minimized --norestore --accept=socket,host=localhost,port=2002;urp; - Run the python examples: /home/joost/python/example-using-dialogbox.py /home/joost/python/example-import-to-calc.py inputdata.csv is the data-file you can use for example-import-to-calc.py My questions: - Is this DialogBox a usefull class? - Is the code correct? - What is missing? - Is it an idea to place dialogbox.py in /core/scripting/source/pyprov/ ? Joost dialogbox.py Description: Binary data example-import-to-calc.py Description: Binary data example-using-dialogbox.py Description: Binary data 34.49 45.17 65.00 67.42 45.54 67.29 89.87 82.91 23.54 53.16 86.85 97.53 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
license statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Joost Wezenbeek (alias: joost eekhoorn, email:joost.eekho...@gmail.com) P.S. I am still searching for a realy easy task for calc, with C++ and/or Python2.7 or Python3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Writer delete row gives a segment violation
Hi, In the current master I got a segment violation, when I create a table in Writer and the delete a row. The bt: Program received signal SIGSEGV, Segmentation fault. 0x03a2a7e4 in SvPtrarr::Count (this=0xd0d0d0d1) at /home/joost/work/git/libo/solver/350/ unxlngi6.pro/inc/svl/svarray.hxx:455 455_SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, 1, SVL_DLLPUBLIC ) (gdb) bt #0 0x03a2a7e4 in SvPtrarr::Count (this=0xd0d0d0d1) at /home/joost/work/git/libo/solver/350/ unxlngi6.pro/inc/svl/svarray.hxx:455 #1 0x03ed1bbc in SwUndoTblNdsChg::SaveSection (this=0x8e18b68, pSttNd= 0xb1b85198) at /home/joost/work/git/libo/sw/source/core/undo/untbl.cxx:1749 #2 0x03bb2906 in _DeleteBox (rTbl=..., pBox=0xb1b52118, pUndo=0x8e18b68, bCalcNewSize=1 '\001', bCorrBorder=1 '\001', pShareFmts=0xbfffdcf8) at /home/joost/work/git/libo/sw/source/core/doc/tblrwcl.cxx:889 #3 0x03bb3607 in SwTable::DeleteSel (this=0x8e18450, pDoc=0x88dd958, rBoxes=..., pMerged=0x0, pUndo=0x8e18b68, bDelMakeFrms=1 '\001', bCorrBorder=1 '\001') at /home/joost/work/git/libo/sw/source/core/doc/tblrwcl.cxx:1130 #4 0x03bdd350 in SwDoc::DeleteRowCol (this=0x88dd958, rBoxes=..., bColumn=false) at /home/joost/work/git/libo/sw/source/core/docnode/ndtbl.cxx:2111 #5 0x03c99a90 in SwFEShell::DeleteRow (this=0x8aa6fd8) at /home/joost/work/git/libo/sw/source/core/frmedt/fetab.cxx:455 In version 3.3.3 it was not a problem. Is this only on my machine, or a real regression? regards Joost ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] fdo #31005 Autoformats does not save
Hi Julien, I tried several evenings to implement only the vertical alignment of fdo#31005, but I fail. Fine that you will look at this issue. 1. tblafmt.cxx and tblafmt.hxx are the main places for writer, but you have also to look at sc/inc/autoformat.hxx, because the autoformat in calc and witer are related! 2. Each time a new feature is added to table-autoformat, a new AUTOFORMAT_ID must be created, so it would be nice to add several features once, otherwise we get very many IDs. 3. First I tought that the vertical alignment was in SvxParaVertAlignItem (editeng/inc/editeng/paravertalignitem.hxx), but then I found out that is done by SwFmtVertOrient (sw/inc/fmtornt.hxx). The last one can not be seen by calc, thus that gives a problem with point 1. 4. I have Implemented SwFmtVertOrient, but it did not autoformat the table. Regards Joost 2011/9/18 Julien Nabet serval2...@yahoo.fr Le 18/09/2011 11:07, Cor Nouws a écrit : Hi Julien, Hi Cor, julien2412 wrote (18-09-11 00:15) I'd like to work on fdo #31005 so first I reproduced the pb. Now I'd like to know where is stored the autoformat templates. Any idea ? You can find it here /user/config/autotbl.fmt. Ok, on my disto, I found it there : ~/.config/libreoffice/3/user/**config/autotbl.fmt Now, how can I read a fmt file ? Pls note that Joost (cc) is interested in/looking at this issue too. No pb, perhaps we're not much to fix this bug. I'll share what I find. Regards, Thank you for the information. Julien. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] UX New layout Move/Copy sheet in calc
Hi Kohei, I see that the path is not pushed (it is not in the current master). It is ofcourse up to you, when you do not want to push it, or to make first further improvements. I am just currious where the problems are, so that I can learn from them. Best regards Joost 2011/1/7 Laurent Godard oooc...@free.fr Hi Joost thanks for these nice ideas regarding Step 3 http://wiki.services.openoffice.org/wiki/User_Experience/Projects/NonModalMessageSystem#Step_3_-_Contextual_Message is there no problem with orthographic correction red waves and grammatical blue ones if you underline with a blue line for the message ? thanks again laurent ___ 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: [Libreoffice] [PATCH] UX New layout Move/Copy sheet in calc
Hi Kohei, You did not miss anything! My mistake: I did only : ./g reset --hard origin/master Now I did (additional) : ./g pull -r And I see the change. Thanks Joost 2011/1/13 Kohei Yoshida kyosh...@novell.com On Thu, 2011-01-13 at 19:58 +0100, Joost Eekhoorn wrote: Hi Kohei, I see that the path is not pushed (it is not in the current master). Sorry, which patch are you speaking of? I did apply your patch attached to the first of this thread. http://cgit.freedesktop.org/libreoffice/calc/commit/?id=7d439aeba0682452b287c30995e2553e956b4dd1 Did I miss anything else!? Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] UX New layout Move/Copy sheet in calc
Michael, Sorry that I used the background color directly. I just do not known jet how to use themes. Is there a theme for displaying a warning label in a dialog? The color of the warning was inspired by the spec: http://wiki.services.openoffice.org/wiki/User_Experience/Projects/NonModalMessageSystem#Step_2_-_Message_Style_2a Where can I find the specs for the UI and UX for LibreOffice? Best regards, Joost 2011/1/5 Michael Meeks michael.me...@novell.com On Tue, 2011-01-04 at 23:03 +0100, Joost Eekhoorn wrote: Thanks for making the improvements. I haven't found a way to change the color of edit box either, so we can leave that a future project for now. Setting the background color is what I have used for the warning Soo ... in general setting manual colors that don't come from the theme is a disaster area for accessibility. aFtWarn.SetControlBackground( Color( COL_YELLOW ) ); There are whole schools-fulls-of users in the tropics that explode when they see the color yellow :-) [ or something like that ]. Seriously; any color we use for highlighting (or whatever) should come from the defined colors used for the rest of the app, and thus from some sort of system theme (ideally). That way it can be changed to be high-contrast / low-contrast etc. This is in part why you tend not to see yellow entries left/right :-) HTH, Michael. -- michael.me...@novell.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] UX New layout Move/Copy sheet in calc
Hello Kohei, Thanks for making the improvements. I haven't found a way to change the color of edit box either, so we can leave that a future project for now. Setting the background color is what I have used for the warning label: aFtWarn.SetControlBackground( Color( COL_YELLOW ) ); I suppose something simular can be used for the edit box, if you want that. Joost 2011/1/3 Kohei Yoshida kyosh...@novell.com Hello Joost, On Tue, 2010-12-28 at 16:45 +0100, Joost Eekhoorn wrote: Hoi Kohei and all, I hope you enjoy the lovely weather. Hereby a patch to give a better user experience to the Move/Copy sheet dialog. The changes are: - Removed the Renamecheckbox. The New name textfield is always available, when one sheet is selected. It is disabled, when multiple sheets are selected. - OK, Cancel and Help buttons placed at the bottom of the dialog. - Copy checkbox replaced by Copy and Move option buttons. - Added 3 section headers: Action, Location and Name. - Placed the text (Current document) behind the name of the of the current document in the list To document. - Display the yellow warning ! This name is already used, when applicable. This all looks good. Once again, I've taken the liberty of making some follow-up modifications after your patch. I basically did: * adjusted the dialog layout a bit to make it look more consistent make better use of available spaces if possible. With this, the list box etc are little wider. * added three different warning messages for different causes: 1) name already used, 2) name is empty, and 3) name has invalid characters. * disable the OK button when the new name is invalid. I did not know a better way to display the warning (I searched several hours.) I think the way you did it is sufficient; but I'd like us to eventually find a way to turn the background of the sheet name box pink (or light red, whatever the actual color is) the same way the chart dialogs do while the background color of the warning text stays transparent. IMO that would fit a little better and more consistent with the rest of our UI. I haven't found a way to change the color of edit box either, so we can leave that a future project for now. I did not changed the Insert before listbox. I think it's best if we leave this alone for now. We'll probably come back to it later. I do not display the current sheet name. I assume you mean displaying the current sheet name in the title bar of the dialog box. Yeah we'll leave this a future project too. Thanks a lot for your patch. :-) Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] UX New layout Move/Copy sheet in calc
Hoi Kohei and all,
I hope you enjoy the lovely weather.
Hereby a patch to give a better user experience to the Move/Copy sheet
dialog.
The changes are:
- Removed the Renamecheckbox.
The New name textfield is always available, when one sheet is
selected.
It is disabled, when multiple sheets are selected.
- OK, Cancel and Help buttons placed at the bottom of the dialog.
- Copy checkbox replaced by Copy and Move option buttons.
- Added 3 section headers: Action, Location and Name.
- Placed the text (Current document) behind the name
of the of the current document in the list To document.
- Display the yellow warning ! This name is already used, when
applicable.
I did not know a better way to display the warning (I searched several
hours.)
I did not changed the Insert before listbox.
I do not display the current sheet name.
MPL 1.1 / GPLv3+ / LGPLv3+, Joost Wezenbeek
Joost
From e4a43859fc768103a64fdc19617190d8728a7332 Mon Sep 17 00:00:00 2001
From: Joost Wezenbeek joost.eekho...@gmail.com
Date: Tue, 28 Dec 2010 16:07:11 +0100
Subject: [PATCH] New layout Move/Copy sheet in calc
OK, Cancel and Help buttons placed at bottom of the dialog
Copy checkbox changed to Copy/Move option buttons
Sections: Action, Location and Name
Warning: This name is already used.
---
sc/inc/scabstdlg.hxx |1 -
sc/source/ui/attrdlg/scdlgfact.cxx |4 --
sc/source/ui/attrdlg/scdlgfact.hxx |1 -
sc/source/ui/inc/miscdlgs.hrc |7 +++
sc/source/ui/inc/mvtabdlg.hxx | 13 -
sc/source/ui/miscdlgs/mvtabdlg.cxx | 76 ---
sc/source/ui/src/miscdlgs.src | 88 +++-
7 files changed, 143 insertions(+), 47 deletions(-)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 0b33261..9a60ab4 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -217,7 +217,6 @@ public:
virtual voidGetTabNameString( String rString ) const = 0;
virtual void SetCopyTable (BOOL bFlag=TRUE) = 0;
virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0;
-virtual void SetRenameTable (BOOL bFlag=TRUE) = 0;
virtual void EnableRenameTable (BOOL bFlag=TRUE) = 0;
};
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index bdfdd1a..dae78d1 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -518,10 +518,6 @@ void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
{
return pDlg-EnableCopyTable( bFlag);
}
-void AbstractScMoveTableDlg_Impl::SetRenameTable(BOOL bFla)
-{
-return pDlg-SetRenameTable( bFla );
-}
void AbstractScMoveTableDlg_Impl::EnableRenameTable(BOOL bFlag)
{
return pDlg-EnableRenameTable( bFlag);
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 121b791..dff3c30 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -267,7 +267,6 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM
virtual voidGetTabNameString( String rString ) const;
virtual void SetCopyTable (BOOL bFlag=TRUE);
virtual void EnableCopyTable (BOOL bFlag=TRUE);
-virtual void SetRenameTable (BOOL bFlag=TRUE);
virtual void EnableRenameTable (BOOL bFlag=TRUE);
};
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 79b5fd0..8b5fed7 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -98,6 +98,13 @@
#define LB_INSERT 4
#define BTN_COPY 5
#define STR_NEWDOC 6
+#define BTN_MOVE 7
+#define FL_ACTION 8
+#define FL_LOCATION 9
+#define FL_NAME 11
+#define FT_TABNAME 12
+#define FT_WARN 13
+#define STR_CURRENTDOC 14
// Eingabe eines Strings
#define ED_INPUT 10
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 3c1b6d2..756a3e3 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -55,21 +55,27 @@ public:
voidGetTabNameString( String rString ) const;
voidSetCopyTable(BOOL bFlag=TRUE);
voidEnableCopyTable (BOOL bFlag=TRUE);
-voidSetRenameTable (BOOL bFlag=TRUE);
voidEnableRenameTable (BOOL bFlag=TRUE);
private:
void ResetRenameInput();
+void CheckNewNameExists();
ScDocument* GetSelectedDoc();
private:
+FixedLine aFlAction;
+RadioButton aBtnMove;
+RadioButton aBtnCopy;
+FixedLine aFlLocation;
FixedText aFtDoc;
ListBox aLbDoc;
FixedText aFtTable;
ListBox aLbTable;
-CheckBoxaBtnCopy;
-CheckBoxaBtnRename;
+FixedLine aFlName;
+FixedText aFtTabName;
EditaEdTabName;
+FixedText aFtWarn;
+FixedLine aFixedLine;
OKButtonaBtnOk;
CancelButtonaBtnCancel;
Re: [Libreoffice] [UX] [PATCH] EasyHacks 3.27 Change Sheet copy process
Hi all, The proposed layout change of Bernhard looks good to me, but there are some pitfalls. Christoph wrote: [...] * If the user copies a sheet (several sheets) within the same file, then the new sheets will be renamed anyway. Right? Although the user did not check the Rename checkbox ... -- As far as I understand, we require unique sheet names. The checkbox refers to a user intended name change. That is just the problem for the programmer, that he does know what the user is going to do, and the user can change his mind. + use case mc01: The user copies SheetA in the same document. The proposed new name becomes SheetA_1. Now the user decides to copy the sheet to another document, where SheetA does not exist, the proposed new name should be SheetA, but only if the user did not rename the new name! I do not known if that is possible, with keeping the code transparant. Bernhard wrote: [...] |Place to insert | |+-+ | | /\ | Sheet 1 | | | || | $sheetname 2 | | | \/ | Sheet 2 | | || Sheet 3 | | |+-+ | That is an challenge for the programmer, because the content of the list must change on the fly. Thus make the challenge not too big: display - position - instand of $sheetname 2. What to do when the user clicks Sheet 3? Drag-and-drop of - position - must be implemented, but not for the existing sheets! I wait for the reaction of Kohei. Best regards, Joost 2010/12/22 Dr. Bernhard Dippold bernh...@familie-dippold.at Hi all sorry: once more I didn't reply all, just reply as on the other LibO lists... here is what I sent to Christoph alone: Hi Christoph, all, just a very short comment - before I forget it... Christoph Noack schrieb: [...] * Think about the Insert Before thing ... it is not that obvious what this means. Is there any way to make this more understandable? Move the Insert Before list below the new name area and move the new name by mouse or arrows up and down in the list. This would allow to place the new sheet where the user wants it without thinking about before and after. Copying your sketch... +-+ | Move / Copy Sheet: $sheetname | +-+ | Action -- + |(o) Move | |( ) Copy | | | | Location and Name --- | |To Document | |[ $documentname (Current Document) |\/] | | | |New Name | |[ $sheetname 2] | | | |Place to insert | |+-+ | | /\ | Sheet 1 | | | || | $sheetname 2 | | | \/ | Sheet 2 | | || Sheet 3 | | |+-+ | | | +-+ | [ Help ] [ OK ] [ Cancel ] | +-+ Best regards Bernhard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [UX] [PATCH] EasyHacks 3.27 Change Sheet copy process
Hi all, If you now give for Sheet1 a new name, e.g.SheetA and that name exists, the new name will become SheetA_2 without a question for the user. Joost 2010/12/22 Kohei Yoshida kyosh...@novell.com On Wed, 2010-12-22 at 12:48 +0100, Joost Eekhoorn wrote: Hi all, The proposed layout change of Bernhard looks good to me, but there are some pitfalls. Christoph wrote: [...] * If the user copies a sheet (several sheets) within the same file, then the new sheets will be renamed anyway. Right? Although the user did not check the Rename checkbox ... -- As far as I understand, we require unique sheet names. The checkbox refers to a user intended name change. That is just the problem for the programmer, that he does know what the user is going to do, and the user can change his mind. + use case mc01: The user copies SheetA in the same document. The proposed new name becomes SheetA_1. Now the user decides to copy the sheet to another document, where SheetA does not exist, the proposed new name should be SheetA, but only if the user did not rename the new name! I do not known if that is possible, with keeping the code transparant. Well, this is not that big of an issue since we do have access to the ScDocument instance of the destination document. When the user switches the destination document, we can ask the new ScDocument instance whether there is a name clash. I already put some code to handle some aspect of that. Bernhard wrote: [...] |Place to insert | | +-+ | | /\ | Sheet 1 | | | || | $sheetname 2 | | | \/ | Sheet 2 | | || Sheet 3 | | | +-+ | That is an challenge for the programmer, because the content of the list must change on the fly.Thus make the challenge not too big: display - position - instand of $sheetname 2. Yup, I agree. Displaying the '- position -' or something like that would make more sense, especially when the user is trying to move or copy multiple sheets. Changing the content of the list is, although it requires some code to write, can be doable. This just means we need to re-populate the list content every time the insertion point moves, but it can be done. What to do when the user clicks Sheet 3? Drag-and-drop of - position - must be implemented, but not for the existing sheets! My preferred approach is to create two buttons to move the insertion position up or down, instead of relying on the user clicking on the sheet name in the list. To me 1) that makes more sense, and 2) is easier to implement than handling mouse click events on the list control. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] EasyHacks Leftover data after Undo
Hi Kohei, Thanks that you simplified the code. I moved the item from the Easy Hacks page to the Completed page. I think now I will try Make macro editing easier or do you have (little) task? Joost 2010/12/21 Kohei Yoshida kyosh...@novell.com Hi Joost, On Mon, 2010-12-20 at 23:19 +0100, Joost Eekhoorn wrote: Hi, A patch for EasyHack Leftover data after Undo operation (qa issue #106711). Before pushing, please check if this patch: - Does fix the problem. - Do not introduce new issues. (Not fixing a problem and generated new ones.) Thanks for the patch. I believe that's the correct place to put a fix for this bug. And that change shouldn't affect other functionalities as far as I can tell. I committed and pushed your patch to master. I also made some follow-up changes to simplify the code a bit without changing the logic of the original code. Cheers, Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] EasyHacks Leftover data after Undo
Hi,
A patch for EasyHack Leftover data after Undo operation (qa issue
#106711).
Before pushing, please check if this patch:
- Does fix the problem.
- Do not introduce new issues. (Not fixing a problem and generated new
ones.)
MPL 1.1 / GPLv3+ / LGPLv3+, Joost Wezenbeek
Joost
From 7abfa9d9d1f21fa58110f533db99be4e302505ff Mon Sep 17 00:00:00 2001
From: Joost Wezenbeek joost.eekho...@gmail.com
Date: Mon, 20 Dec 2010 23:02:07 +0100
Subject: [PATCH] Leftover data after Undo operation
qa issue #106711
---
sc/source/ui/view/viewfun3.cxx | 21 +
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 42f75c6..10cea3a 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1063,6 +1063,27 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc,
}
aFilteredMark.SetMarkArea( aMarkRange);
}
+else
+{
+// FIX for issue #106711 : leftover data after undo.
+if (!bNoPaste )
+{
+ScRange rRange;
+aFilteredMark.GetMarkArea( rRange );
+if( (rRange.aEnd.Col() - rRange.aStart.Col()) nDestSizeX )
+{
+nStartCol = rRange.aStart.Col();
+nStartRow = rRange.aStart.Row();
+nStartTab = rRange.aStart.Tab();
+nEndCol = nStartCol + nDestSizeX;
+nEndRow = rRange.aEnd.Row();
+nEndTab = rRange.aEnd.Tab();
+aMarkRange = ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab);
+aFilteredMark.SetMarkArea( aMarkRange);
+}
+}
+}
+
if (bNoPaste)
{
ErrorMessage(STR_MSSG_PASTEFROMCLIP_0);
--
1.7.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] [PUSHED] EasyHacks 3.27 Change Sheet copy process
Hi Kohei, Thanks a lot for completing. Can you mark this Easy Hack 3.27 as completed on the Development/Easy Hacks page? Or explain to me how to do that? I am now looking at - 3.28 Leftover data after an Undo operationhttp://wiki.documentfoundation.org/Easy_Hacks#Leftover_data_after_an_Undo_operation Joost 2010/12/14 Kohei Yoshida kyosh...@novell.com Hi Andy, On Mon, 2010-12-13 at 21:06 -0800, Andy Brown wrote: I would like to thank you guys. This will be great. :) Any idea when we will see it in action? Well, since this just landed on master, I would say it'll be in the next major version after 3.3maybe 3.4? Just a guess. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc kyosh...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] EasyHacks 3.27 Change Sheet copy process
Hi Andy and Kohei,
Hereby additional patch with:
* Check on pName is NULL.
* Showing original sheet name in input box, when Rename option is checked.
Not implemented: OrgName_#.
Joost
2010/12/12 Joost Eekhoorn joost.eekho...@gmail.com
Hi Andy,
Point made.
I will do the same as in the Rename dialog, thus if 'Sheet1' is selected,
the rename input box will show 'Sheet1', when Rename is checked.
I must also fix something in my last patch, now that MoveTable has a
pointer as last argument:
if( rName.Len() )
is changed to:
if( pName-Len() )
but must be:
if( ( pName != NULL ) ( pName-Len() ) )
Joost
2010/12/11 Andy Brown a...@the-martin-byrd.net
On Sat Dec 11 2010 13:54:38 GMT-0800 (PST) Joost Eekhoorn wrote:
Hi Kohei,
* I think it would be more user-friendly if the Rename input box
showed the default sheet name. When moving a sheet, this would be
the original sheet name, while when copying a sheet it would be the
original name followed by '_' + num (e.g. Sheet1 - Sheet1_1).
An empty imput box is logical to me, because the Rename dialog shows
also an empty in input box.
But if you want, I can try to impement it.
It is not in this patch, because it more difficult than it sounds.
The default name depends on the document where the copy is going to,
if it is the same document or another document.
The default for RC1 is to use the default sheet name when selecting Rename
from the context menu, see attached. Personally I would prefer to follow
this for the new setup.
Thanks again for taking this on.
Andy
From 003188d6ea1aebd0a07c7eba6198ac0b7605c2ae Mon Sep 17 00:00:00 2001
From: Joost Wezenbeek joost.eekho...@gmail.com
Date: Sun, 12 Dec 2010 12:04:34 +0100
Subject: [PATCH] Change Sheet copy process
Easy Hacks 3.27
Added rename in Move/Copy Sheet in calc
---
sc/inc/scabstdlg.hxx |4 +++-
sc/source/ui/attrdlg/scdlgfact.cxx |6 --
sc/source/ui/attrdlg/scdlgfact.hxx |5 -
sc/source/ui/inc/mvtabdlg.hxx |4 +++-
sc/source/ui/miscdlgs/mvtabdlg.cxx | 10 +-
sc/source/ui/view/tabvwshf.cxx |7 ++-
sc/source/ui/view/viewfun2.cxx |4 ++--
7 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 102ea20..93b291c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -410,7 +410,9 @@ public:
long nFirst = 1,
long nLast = 100 ) = 0;
-virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ) = 0; //add for ScMoveTableDlg
+virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, //add for ScMoveTableDlg
+const String rDefault,
+int nId ) = 0;
virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window * pParent, USHORT nFlags, int nId ) = 0; //add for ScNameCreateDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 10f0065..d31bd7e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1125,13 +1125,15 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg
//add for ScMoveTableDlg begin
-AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg( Window* pParent, int nId )
+AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg( Window* pParent,
+ const String rDefault,
+ int nId )
{
ScMoveTableDlg * pDlg=NULL;
switch ( nId )
{
case RID_SCDLG_MOVETAB :
-pDlg = new ScMoveTableDlg( pParent );
+pDlg = new ScMoveTableDlg( pParent, rDefault );
break;
default:
break;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index f4a8286..0738e97 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -492,7 +492,10 @@ public:
long nFirst = 1,
long nLast = 100 );
-virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, int nId ); //add for ScMoveTableDlg
+virtual AbstractScMoveTableDlg * CreateScMoveTableDlg( Window* pParent, //add for ScMoveTableDlg
+const String rDefault,
+int nId );
+
virtual AbstractScNameCreateDlg * CreateScNameCreateDlg ( Window
Re: [Libreoffice] [PATCH] EasyHacks 3.27 Change Sheet copy process
Hi Kohei,
Thanks for your review. Hereby an additional patch with changes on 4
comment-items. 2 items are not done.
MPL 1.1 / GPLv3+ / LGPLv3+
About UI
* Let's remove the 'New Name' string as I feel this is redundant. And
let' place the rename box either to the immediate right of 'Rename'
check box, or immediately below it. I prefer it being to the right
of the check box since we have a plenty of space there.
Done.
* Instead of hiding the rename box, it's better to disable it when the
Rename check box is not checked. We generally don't show or hide
controls but enable or disable it.
Done.
* Let's disable the Rename check box as well as the rename input box
when multiple sheets are selected. We don't know what we should do
for multiple sheet copy/move rename yet, so I would be more
comfortable disabling it in such cases (at least for now).
Done.
* I think it would be more user-friendly if the Rename input box
showed the default sheet name. When moving a sheet, this would be
the original sheet name, while when copying a sheet it would be the
original name followed by '_' + num (e.g. Sheet1 - Sheet1_1).
An empty imput box is logical to me, because the Rename dialog shows
also an empty in input box.
But if you want, I can try to impement it.
It is not in this patch, because it more difficult than it sounds.
The default name depends on the document where the copy is going to,
if it is the same document or another document.
Others
* Move rename sheet and undo afterward doesn't undo the renaming.
But this is less critical, and I could look into it if you don't
want to.
Skipped.
If you do undo (Ctrl-Z) twice, then the renaming will also be undone.
Code:
* Regarding the additional parameter in ScViewFunc::MoveTable(), I
prefer using a pointer to String with a default value of NULL, since
it's an optional parameter conceptually.
Done.
Joost
2010/12/11 Kohei Yoshida kyosh...@novell.com
On Fri, 2010-12-10 at 20:31 -0500, Kohei Yoshida wrote:
I'll CC Christoph in case he has some comments on this feature as well
as on my comments above. Christoph, please feel free to add your
comments as well if you have any. :-)
And these are the screenshots of the new dialog.
Rename unchecked
http://people.freedesktop.org/~kohei/sheet-rename-unchecked.pnghttp://people.freedesktop.org/%7Ekohei/sheet-rename-unchecked.png
Rename checked
http://people.freedesktop.org/~kohei/sheet-rename-checked.pnghttp://people.freedesktop.org/%7Ekohei/sheet-rename-checked.png
--
Kohei Yoshida, LibreOffice hacker, Calc
kyosh...@novell.com
From 5ba6fe63e561625a1cbf109f98f32397ca6ec5b6 Mon Sep 17 00:00:00 2001
From: Joost Wezenbeek joost.eekho...@gmail.com
Date: Sat, 11 Dec 2010 21:52:42 +0100
Subject: [PATCH] Change Sheet copy process
Easy Hacks 3.27
Added rename in Move/Copy Sheet in calc
---
sc/inc/scabstdlg.hxx |2 ++
sc/source/ui/attrdlg/scdlgfact.cxx |9 +
sc/source/ui/attrdlg/scdlgfact.hxx |2 ++
sc/source/ui/inc/mvtabdlg.hxx |5 +++--
sc/source/ui/inc/viewfunc.hxx |2 +-
sc/source/ui/miscdlgs/mvtabdlg.cxx | 28 +---
sc/source/ui/src/miscdlgs.src | 16 +---
sc/source/ui/view/tabcont.cxx |2 +-
sc/source/ui/view/tabvwshf.cxx |6 +-
sc/source/ui/view/viewfun2.cxx | 10 +-
10 files changed, 50 insertions(+), 32 deletions(-)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index dc20e8f..102ea20 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -217,6 +217,8 @@ public:
virtual voidGetTabNameString( String rString ) const = 0;
virtual void SetCopyTable (BOOL bFlag=TRUE) = 0;
virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0;
+virtual void SetRenameTable (BOOL bFlag=TRUE) = 0;
+virtual void EnableRenameTable (BOOL bFlag=TRUE) = 0;
};
class AbstractScNameCreateDlg : public VclAbstractDialog //add for ScNameCreateDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 5a78eae..10f0065 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -518,6 +518,15 @@ void AbstractScMoveTableDlg_Impl::EnableCopyTable(BOOL bFlag)
{
return pDlg-EnableCopyTable( bFlag);
}
+void AbstractScMoveTableDlg_Impl::SetRenameTable(BOOL bFla)
+{
+return pDlg-SetRenameTable( bFla );
+}
+void AbstractScMoveTableDlg_Impl::EnableRenameTable(BOOL bFlag)
+{
+return pDlg-EnableRenameTable( bFlag);
+}
+
//add for AbstractScMoveTableDlg_Impl end
//add for AbstractScNameCreateDlg_Impl begin
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index dc583a6..f4a8286 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -267,6 +267,8 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM
virtual void
[Libreoffice] [PATCH] EasyHacks 3.27 Change Sheet copy process
Hi,
Please review if this patch is realy correct and complete.
- 'Rename input box' is only visible when 'Rename check box' is checked.
- Rename is only done when 'Rename check box' is checked and 'Rename input
box'
has a string.
- Rename works for copied and moved sheets.
- Rename works when the target is the same document, a new document or a
other existing document.
I did not know how test the automation part in source/ui/view/viewfun2.cxx
And check if String() in correct in ExecuteDrop() in
sc/source/ui/view/tabcont.cxx
What must I did with move-copy-sheet.xml (on 2 places!).
Must the help be adapted? How/where must that be done?
Joost
From 6125b12150b1eabb66d83029b3da912e34e24a7d Mon Sep 17 00:00:00 2001
From: Joost Wezenbeek joost.eekho...@gmail.com
Date: Fri, 10 Dec 2010 20:03:11 +0100
Subject: [PATCH] Change Sheet copy process
Easy Hacks 3.27
Added rename in Move/Copy Sheet in calc
---
sc/inc/scabstdlg.hxx |2 +
sc/source/ui/attrdlg/scdlgfact.cxx |8 ++
sc/source/ui/attrdlg/scdlgfact.hxx |2 +
sc/source/ui/inc/mvtabdlg.hxx | 10
sc/source/ui/inc/viewfunc.hxx |2 +-
sc/source/ui/miscdlgs/mvtabdlg.cxx | 42 +++-
sc/source/ui/src/miscdlgs.src | 22 ++-
sc/source/ui/view/tabcont.cxx |2 +-
sc/source/ui/view/tabvwshf.cxx | 16 -
sc/source/ui/view/viewfun2.cxx | 20 +++-
10 files changed, 119 insertions(+), 7 deletions(-)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index e880df8..dc20e8f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -213,6 +213,8 @@ public:
virtual USHORT GetSelectedDocument () const = 0;
virtual USHORT GetSelectedTable () const = 0;
virtual BOOL GetCopyTable () const = 0;
+virtual BOOL GetRenameTable () const = 0;
+virtual voidGetTabNameString( String rString ) const = 0;
virtual void SetCopyTable (BOOL bFlag=TRUE) = 0;
virtual void EnableCopyTable (BOOL bFlag=TRUE) = 0;
};
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index fa14720..5a78eae 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -502,6 +502,14 @@ BOOL AbstractScMoveTableDlg_Impl::GetCopyTable() const
{
return pDlg-GetCopyTable();
}
+BOOL AbstractScMoveTableDlg_Impl::GetRenameTable() const
+{
+return pDlg-GetRenameTable();
+}
+void AbstractScMoveTableDlg_Impl::GetTabNameString( String rString ) const
+{
+pDlg-GetTabNameString( rString );
+}
void AbstractScMoveTableDlg_Impl::SetCopyTable(BOOL bFla)
{
return pDlg-SetCopyTable( bFla );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index f1ec2a5..dc583a6 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -263,6 +263,8 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM
virtual USHORT GetSelectedDocument () const;
virtual USHORT GetSelectedTable () const;
virtual BOOL GetCopyTable () const;
+virtual BOOL GetRenameTable () const;
+virtual voidGetTabNameString( String rString ) const;
virtual void SetCopyTable (BOOL bFlag=TRUE);
virtual void EnableCopyTable (BOOL bFlag=TRUE);
};
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 1260737..543fa01 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -35,6 +35,7 @@
#include vcl/imagebtn.hxx
#include vcl/lstbox.hxx
#include vcl/fixed.hxx
+#include vcl/edit.hxx
#include layout/layout.hxx
#include layout/layout-pre.hxx
@@ -50,8 +51,12 @@ public:
USHORT GetSelectedDocument () const;
SCTAB GetSelectedTable () const;
BOOL GetCopyTable () const;
+BOOL GetRenameTable () const;
+voidGetTabNameString( String rString ) const;
void SetCopyTable (BOOL bFlag=TRUE);
void EnableCopyTable (BOOL bFlag=TRUE);
+void SetRenameTable (BOOL bFlag=TRUE);
+void SetTabNameVisible (BOOL bFlag=TRUE);
private:
FixedText aFtDoc;
@@ -59,6 +64,9 @@ private:
FixedText aFtTable;
ListBox aLbTable;
CheckBox aBtnCopy;
+CheckBox aBtnRename;
+FixedText aFtTabName;
+Edit aEdTabName;
OKButton aBtnOk;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
@@ -66,11 +74,13 @@ private:
USHORT nDocument;
SCTAB nTable;
BOOL bCopyTable;
+BOOL bRenameTable;
//--
void Init ();
void InitDocListBox ();
DECL_LINK( OkHdl, void * );
DECL_LINK( SelHdl, ListBox * );
+DECL_LINK( RenameHdl, void * );
};
#include layout/layout-post.hxx
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 0cacc54..e8ed808 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -272,7
[Libreoffice] new bootstrap: How do the devellop[ install?
I have build on a new installed Ubuntu (because of harddisk problems). The 2 build threads are ready without errors, but there is not the message in the bash-shell that it is all OK. Now I want to do something like: bin/ooinstall -l /home/joost/work/libretest But there is no bin/ooinstall How must install and test the code that I change? Joost ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] new bootstrap: How do the devellop[ install?
Great, it works!! Joost 2010/12/7 Joost Eekhoorn joost.eekho...@gmail.com Yes, it is mentioned after ./configure I was not sure what is was going to do, but that can be seen with make -n dev-install, which display what it is going to do, without doing it. Thanks, I will try it this evening. Joost 2010/12/7 Sebastian Spaeth sebast...@sspaeth.de On Tue, 7 Dec 2010 10:39:41 +0100, Joost Eekhoorn wrote: Hi Sebastian, bin/ooinstall is not mentioned on the new webpage. yep, I removed it. Can you mention make dev-install on the webpage? Done, although everything going beyond there real basic instructions is supposed to be in the wiki page, I believe. Can you also mention it in the bash, when the build is ready? make, make dev-install and make check are actually mentioned after each ./configure run I think. Sebastian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Another failed setup ...
Cheers, Good to see that I am not the only one. Before my building on cppunit. Now I have exact the same problem as you. I can not find a way out. Hope that someone comes with an idea. I think it has to do with i10n and en_US.UTF8, but that is only a guess. Michael advised strace -f -e file make to get more information. On what type of system are you running (Ubuntu, Fedora, OpenSuse, Slackware?). Joost 2010/12/3 Wols Lists antli...@youngman.org.uk Just redone. No obvious error - same crash :-( Cheers, Wol On 03/12/10 20:12, Wols Lists wrote: I wonder. Is the download script flakey? My internet has been a little bit iffey these last few days (we're not used to half an inch of snow over here :-) and it looks as though it's fallen over. Notice the Read error below - at which point downloading seems to have stopped instantly, and post-install checks run. Is this why l10n then fails? And when I try and re-run - nothing happens. ./download doesn't load anything, re-running make doesn't try to download anything still missing. If most people have got a clean internet link, that could explain an intermittent problem ... (btw, is there a reason it's downloading .dll's on linux?) Cheers, Wol 2010-12-03 18:17:07 URL: http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 [306902/306902] - 9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 [1] 185d60944ea767075d27247c3162b3bc-unowinreg.dll 2010-12-03 18:17:07 URL: http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll [12288/12288] - 185d60944ea767075d27247c3162b3bc-unowinreg.dll [1] c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip Read error (Connection timed out) in headers. mv: cannot stat `c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip': No such file or directory * * Running the post download checks. * checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu found wget: wget found md5sum: md5sum c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip Read error (Connection timed out) in headers. 2010-12-03 19:01:46 URL: http://www.numbertext.org/linux/c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip [3880704/3880704] - c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip [13] * * Running the post download checks. * checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking target system type... x86_64-unknown-linux-gnu build -- version: 275224 Fetching dependencies for module l10n from solver... failed = Building module testautomation = make: *** [all] Error 141 anth...@ashdown ~/gitstuff/lonew $ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Building problem, cppunit, libcppunit undefined reference to dlopen
I missed the e-mail about moving from rawbuild to native build, so I did remove the old installation. Then I did a new Native Build installation as described on the wiki page. I failed with this dl problem in cppunit: make[2]: Entering directory `/home/joost/work/git/libo/clone/libs-extern/cppunit/ unxlngx6.pro/misc/build/cppunit-1.12.1/src/DllPlugInTester' /bin/sh ../../libtool --tag=CXX --mode=link g++ -ldl -o DllPlugInTester DllPlugInTester.o CommandLineParser.o ../../src/cppunit/libcppunit.la -lm g++ -o .libs/DllPlugInTester DllPlugInTester.o CommandLineParser.o -ldl ../../src/cppunit/.libs/libcppunit.so -lm -Wl,--rpath -Wl,/home/joost/work/git/libo/clone/libs-extern/cppunit/ unxlngx6.pro/misc/build/cppunit-1.12.1/ooo-install/lib ../../src/cppunit/.libs/libcppunit.so: undefined reference to `dlsym' ../../src/cppunit/.libs/libcppunit.so: undefined reference to `dlopen' ../../src/cppunit/.libs/libcppunit.so: undefined reference to `dlclose' collect2: ld returned 1 exit status make[2]: *** [DllPlugInTester] Error 1 make[2]: Leaving directory `/home/joost/work/git/libo/clone/libs-extern/cppunit/ unxlngx6.pro/misc/build/cppunit-1.12.1/src/DllPlugInTester' make[1]: *** [install-recursive] Error 1 make[1]: Leaving directory `/home/joost/work/git/libo/clone/libs-extern/cppunit/ unxlngx6.pro/misc/build/cppunit-1.12.1/src' make: *** [install-recursive] Error 1 dmake: Error code 2, while making './ unxlngx6.pro/misc/build/so_built_cppunit' Re-installing glibc and glibc32 did not solve the problem. I am running on OpenSuse (64bits). Joost ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Building problem, DEBUG_ELEMENT when DEBUG is off
Hi,
I had a problem in writerfilter, building without DEBUG.
I did some local hack with #undef, to get it building again.
#ifdef DEBUG
#include resourcemodel/TagLogger.hxx
namespace writerfilter {
namespace dmapper {
extern TagLogger::Pointer_t dmapper_logger;
}
}
#else
#undef DEBUG_ELEMENT
#undef DEBUG_CREATE
#undef DEBUG_PROPERTIES
#undef DEBUG_ATTRIBUTES
#undef DEBUG_RESOLVE
#undef DEBUG_MEMORY
#undef DEBUG_CONTEXT_STACK
#undef DEBUG_DOMAINMAPPER
#endif // DEBUG
I hope it is fixed in the repository, so the next pull will be good.
I do not see others reporting building-problems.
Must report these problems or not?
Joost
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Building problem, sc/source/ui/src/optdlg.src gives syntax error
I did make clean make The make clean removed the the complete build/libreoffice-3.2.99.2 directory. It is now building 2 hours and I will see tomorrow-morning what the result is. Tomorrow-evening (after my work and helping my son with mail-delivering) I will report if it works. Joost 2010/11/22 Pierre-André Jacquod pjacq...@alumni.ethz.ch Hi, I know...but I had exactly this problem once, and the make clean did not solved the issue. At the end, I did this an evening, and all went well the next day. I would be interested to know if the make clean works for you. Thanks Pierre-André On 11/22/2010 10:48 AM, Michael Meeks wrote: On Mon, 2010-11-22 at 07:57 +0100, Pierre-André Jacquod wrote: hello, rm -rf * ./download Oh - that is going to waste a -lot- of time ;-) Just remove the build output, not the ( pristine ) git repos. 'make clean' should do that in the top-level. HTH, Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Use sal_Unicode or RTL_CONSTASCII_USTRINGPARAM for single unicode character?
Hi,
CONTEXT:
For single characters I see often sal_Unicode( '/' ) used and sometimes
OUString( sal_Unicode( '/' ).
Examples (for adding one space):
- aDefaultPageName += sal_Unicode( ' ' );
- sAuthor += OUString( sal_Unicode( ' ' );
sal_Unicode is defined in ./sal/inc/rtl/ustring.hxx
In ./sal/inc/rtl/ustring.hxx I see that OUString uses sal_Unicode.
There is also the typedef rtl_uString:
typedef struct _rtl_uString
{
oslInterlockedCount refCount; /* opaque */
sal_Int32 length;
sal_Unicode buffer[1];
} rtl_uString;
QUESTION:
So if there is SAuthor += OUString::createFromAscii( );
which is the correct replacement:
- sAuthor += OUString( RTL_CONSTASCII_USTRINGPARAM(sal_Unicode( );
- sAuthor += OUString( sal_Unicode( ' ' );
- sAuthor += sal_Unicode( ' ' );
Joost
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM in svx
MPL 1.1 / GPLv3+ / LGPLv3+
Joost
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 467cc97..c4e6e10 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -228,7 +228,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Referenceio::XInpu
aParserInput.aInputStream = xInputStream;
// get parser
-Reference xml::sax::XParser xParser( xServiceFactory-createInstance( OUString::createFromAscii(com.sun.star.xml.sax.Parser) ), UNO_QUERY );
+Reference xml::sax::XParser xParser( xServiceFactory-createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(com.sun.star.xml.sax.Parser)) ), UNO_QUERY );
DBG_ASSERT( xParser.is(), Can't create parser );
// prepare filter arguments
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 32bfaae..1028482 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -605,7 +605,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString rPictureSt
xProps-setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( MediaType ) ), aAny );
}
-const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString::createFromAscii( image/tiff ) ) );
+const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( image/tiff )) ) );
aAny = bCompressed;
xProps-setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( Compressed ) ), aAny );
@@ -946,7 +946,7 @@ Reference XOutputStream SAL_CALL SvXMLGraphicHelper::createOutputStream()
if( aId.getLength() )
{
-aRet = ::rtl::OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE );
+aRet = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( XML_GRAPHICOBJECT_URL_BASE ));
aRet += aId;
}
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6941fd6..18476ef 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString Service
//--
::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw()
{
-return ::rtl::OUString::createFromAscii(com.sun.star.form.FmXGridControl);
+return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.form.FmXGridControl));
}
//--
@@ -439,7 +439,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString Service
{
Sequence ::rtl::OUString aServiceNames(2);
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
-aServiceNames[1] = ::rtl::OUString::createFromAscii(com.sun.star.awt.UnoControl);
+aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.awt.UnoControl));
return aServiceNames;
}
@@ -460,7 +460,7 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
//--
::rtl::OUString FmXGridControl::GetComponentServiceName()
{
-::rtl::OUString aName = ::rtl::OUString::createFromAscii(DBGrid);
+::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM(DBGrid));
return aName;
}
@@ -1121,7 +1121,7 @@ namespace fmgridif
{
const ::rtl::OUString getDataModeIdentifier()
{
-static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( DataMode ) );
+static ::rtl::OUString s_sDataModeIdentifier( RTL_CONSTASCII_USTRINGPARAM( DataMode ) );
return s_sDataModeIdentifier;
}
}
@@ -2798,7 +2798,7 @@ Sequence ::com::sun::star::util::URL FmXGridPeer::getSupportedURLs()
// let an ::com::sun::star::util::URL-transformer normalize the URLs
Reference ::com::sun::star::util::XURLTransformer xTransformer(
::comphelper::getProcessServiceFactory()-createInstance(
-::rtl::OUString::createFromAscii(com.sun.star.util.URLTransformer)),
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.util.URLTransformer))),
UNO_QUERY);
pSupported = aSupported.getArray();
if (xTransformer.is())
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6941fd6..18476ef 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString Service
//--
::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw()
{
-return
[Libreoffice] C2U 61 time defined and with 2 differed meanings
Hi, CONTEXT: I like short naming, thus I find RTL_CONSTASCII_USTRINGPARAM far too long. But the there is C2U. That is defined 61 times and sometimes as: #define C2U(cChar) OUString::createFromAscii(cChar) and on other places as: #define C2U(cChar) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cChar)) ./filter/inc/filter/msfilter/msocximex.hxx://#define C2U(cChar) rtl::OUString::createFromAscii(cChar) ./filter/source/msfilter/msocximex.cxx:#define C2U(cChar) rtl::OUString::createFromAscii(cChar) ./xmloff/source/core/xmlexp.cxx:#define C2U(cChar) OUString( RTL_CONSTASCII_USTRINGPARAM(cChar) ) ./xmloff/source/core/DocumentSettingsContext.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./svl/source/config/srchcfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./svl/source/config/asiancfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./svl/source/config/cjkoptions.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_svx/source/options/svx_asiancfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_svtools/source/config/svt_cjkoptions.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_svtools/source/config/svt_misccfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_svtools/source/config/svt_colorcfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/config/sw_dbconfig.cxx:/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/config/sw_modcfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/config/sw_prtopt.cxx:/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/config/sw_usrpref.cxx:/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/config/sw_fontcfg.cxx:/*N*/ #define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx:#define C2U(cChar) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cChar)) ./binfilter/bf_sw/source/ui/app/sw_docshini.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx:#define C2U(char) ::rtl::OUString::createFromAscii(char) ./binfilter/bf_sw/source/core/unocore/sw_SwXTextDefaults.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/core/text/sw_inftxt.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./binfilter/bf_sw/source/core/fields/sw_authfld.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./binfilter/inc/bf_sw/unoobj.hxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./binfilter/bf_starmath/source/starmath_unomodel.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./sd/source/ui/annotations/annotationmanager.cxx:#define C2U(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) ./sd/source/ui/slideshow/slideshow.cxx:#define C2U(x) OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) ./sd/source/ui/slideshow/SlideShowRestarter.cxx:#define C2U(x) OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) ./sd/source/ui/table/TableDesignPane.cxx:#define C2U(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) ) ./sd/source/ui/func/fuhhconv.cxx:#define C2U(cChar) rtl::OUString::createFromAscii(cChar) ./svtools/source/misc/bindablecontrolhelper.cxx:#define C2U(cChar) rtl::OUString::createFromAscii(cChar) ./svtools/source/config/extcolorcfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./svtools/source/config/htmlcfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./svtools/source/config/fontsubstconfig.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./svtools/source/config/colorcfg.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./sw/inc/unomid.h:#define C2U(cChar) rtl::OUString::createFromAscii( cChar ) ./sw/source/ui/smartmenu/stmenu.cxx:#define C2U(cChar) rtl::OUString::createFromAscii(cChar) ./sw/source/core/edit/edlingu.cxx:#define C2U(cChar) rtl::OUString::createFromAscii(cChar) ./extensions/source/bibliography/bibload.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./extensions/source/bibliography/bibview.cxx:#define C2U( cChar ) ::rtl::OUString::createFromAscii( cChar ) ./extensions/source/bibliography/bibbeam.cxx:#define C2U(cChar) OUString::createFromAscii(cChar) ./extensions/source/bibliography/datman.cxx:#define C2U(cChar) ::rtl::OUString::createFromAscii(cChar) ./extensions/source/bibliography/bibconfig.cxx:#define C2U(cChar) OUString::createFromAscii(cChar)
[Libreoffice] Building problem, sc/source/ui/src/optdlg.src gives syntax error
Hi,
PROBLEM 1:
I am trying to make again, but it fails on
./sc/source/ui/src/optdlg.src
I did remove the unxlngx6.pro in the sc, and did the build there locally and
it gave:
Making:ui.srs
{
^
f4101: optdlg.src, line 118: Warning in the object (Type: FixedLine):
Resources without name are ignored.
{
^
f640: optdlg.src, line 118: Error: syntax error
f256: Error: !! 1 Error found!!
Error starting rsc2 compiler
dmake: Error code 1, while making '../../../unxlngx6.pro/srs/ui.srs'
PROBLEM 2:
The problem I had on the previous build:
I had a good build and did an install, but the I could not run the program
with ./soffice.bin. It could not found soffice.bin.bin.
(I did make soffice.bin.bin copy and then it could not find
soffice.bin.bin.bin)
Joost
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] HC Image fix
Hi The hack work, but now my build brake in sal: Making:libuno_sal.so.3 ../unxlngx6.pro/slo/semaphor.o: In function `osl_createSemaphore': semaphor.c:(.text+0x2a): undefined reference to `sem_init' ../unxlngx6.pro/slo/semaphor.o: In function `osl_destroySemaphore': semaphor.c:(.text+0x6a): undefined reference to `sem_destroy' ../unxlngx6.pro/slo/semaphor.o: In function `osl_acquireSemaphore': semaphor.c:(.text+0x9c): undefined reference to `sem_wait' ../unxlngx6.pro/slo/semaphor.o: In function `osl_tryToAcquireSemaphore': semaphor.c:(.text+0xbc): undefined reference to `sem_trywait' ../unxlngx6.pro/slo/semaphor.o: In function `osl_releaseSemaphore': semaphor.c:(.text+0xdc): undefined reference to `sem_post' Maybe that I do somthing wrong in my pull and building procedure. Joost 2010/11/17 Cédric Bosdonnat cedric.bosdonnat@free.fr Hi all and mostly Joseph, We all had to face some build error in vcl... I pushed the following quick hack... but I'ld like Joseph to review it and correct it if needed: http://cgit.freedesktop.org/libreoffice/libs-gui/commit/?id=a2603a2edb54f78a746e5edfba181d429727dea7 Regards, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM in svx
MPL 1.1 / GPLv3+ / LGPLv3+
(Hope 13e patch on the 13 has no mistakes in it:) )
Joost
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 877ea51..70aaa82 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -42,11 +42,11 @@ using namespace ::svxform;
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
{
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface xRet;
-if ( ServiceSpecifier.indexOf( ::rtl::OUString::createFromAscii(com.sun.star.form.component.) ) == 0 )
+if ( ServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.form.component.)) ) == 0 )
{
xRet = ::comphelper::getProcessServiceFactory()-createInstance(ServiceSpecifier);
}
-else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString::createFromAscii(com.sun.star.drawing.ControlShape) ) )
+else if ( ServiceSpecifier == ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ControlShape)) ) )
{
SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL);
xRet = *new SvxShapeControl(pObj);
@@ -107,19 +107,19 @@ using namespace ::svxform;
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface xRet;
sal_uInt16 nTokenCount = ServiceName.getTokenCount('.');
if (nTokenCount == 5
-ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii(stardiv)
-ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii(one)
-ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii(form)
-ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii(component))
+ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(stardiv))
+ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(one))
+ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(form))
+ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(component)) )
{
xRet = ::comphelper::getProcessServiceFactory()-createInstance(ServiceName);
}
else
if (nTokenCount == 4
-ServiceName.getToken( 0, '.' ) == ::rtl::OUString::createFromAscii(stardiv)
-ServiceName.getToken( 1, '.' ) == ::rtl::OUString::createFromAscii(one)
-ServiceName.getToken( 2, '.' ) == ::rtl::OUString::createFromAscii(drawing)
-ServiceName.getToken( 3, '.' ) == ::rtl::OUString::createFromAscii(ControlShape))
+ServiceName.getToken( 0, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(stardiv))
+ServiceName.getToken( 1, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(one))
+ServiceName.getToken( 2, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(drawing))
+ServiceName.getToken( 3, '.' ) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ControlShape)) )
{
SdrObject* pObj = new FmFormObj();
xRet = *new SvxShapeControl(pObj);
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 703a66a..dc509d9 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -375,7 +375,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
Reference XInterface xSourceContainer = xSourceAsChild-getParent();
m_xEnvironmentHistory = Reference XIndexContainer (
-::comphelper::getProcessServiceFactory()-createInstance(::rtl::OUString::createFromAscii(com.sun.star.form.Forms)),
+::comphelper::getProcessServiceFactory()-createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.form.Forms)) ),
UNO_QUERY);
DBG_ASSERT(m_xEnvironmentHistory.is(), FmFormObj::clonedFrom : could not create a forms collection !);
@@ -581,7 +581,7 @@ Reference XInterface FmFormObj::ensureModelEnv(const Reference XInterface
{
// create and insert (into the destination) a copy of the form
xCurrentDestForm.set(
-::comphelper::getProcessServiceFactory()-createInstance(::rtl::OUString::createFromAscii( com.sun.star.form.component.DataForm ) ),
+::comphelper::getProcessServiceFactory()-createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( com.sun.star.form.component.DataForm )) ),
UNO_QUERY_THROW );
::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm );
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 404ffb3..2c351ed 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -390,8 +390,8 @@ namespace
Sequence Type aModelListeners;
Sequence Type aControlListeners;
-
[Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM in svx
MPL 1.1 / GPLv3+ / LGPLv3+
Joost
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 03623fb..b906c74 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -354,7 +354,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent _rEvt )
// not interested in any results
Reference XPropertySet xStatProps(xStatement,UNO_QUERY);
-xStatProps-setPropertyValue(rtl::OUString::createFromAscii(MaxRows), makeAny(sal_Int32(0)));
+xStatProps-setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MaxRows)), makeAny(sal_Int32(0)));
xResultSet = xStatement-executeQuery();
Reference XColumnsSupplier xSupplyCols(xResultSet, UNO_QUERY);
@@ -1173,7 +1173,7 @@ void FmGridControl::DeleteSelectedRows()
// #100312#
Reference ::com::sun::star::util::XURLTransformer xTransformer(
::comphelper::getProcessServiceFactory()-createInstance(
-::rtl::OUString::createFromAscii(com.sun.star.util.URLTransformer)), UNO_QUERY);
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.util.URLTransformer))), UNO_QUERY);
if( xTransformer.is() )
xTransformer-parseStrict( aUrl );
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index ad0c94b..aa6c913 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -89,8 +89,8 @@ namespace
//--
sal_Int32 getColumnTypeByModelName(const ::rtl::OUString aModelName)
{
-const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii(com.sun.star.form.component.);
-const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii(stardiv.one.form.component.);
+const ::rtl::OUString aModelPrefix(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.form.component.));
+const ::rtl::OUString aCompatibleModelPrefix(RTL_CONSTASCII_USTRINGPARAM(stardiv.one.form.component.));
sal_Int32 nTypeId = -1;
if (aModelName == FM_COMPONENT_EDIT)
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 999b155..54c288a 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -123,19 +123,19 @@ void DescriptionGenerator::Initialize (::rtl::OUString sPrefix)
{
if (mxSet.is())
{
-uno::Any aValue = mxSet-getPropertyValue (OUString::createFromAscii (Style));
+uno::Any aValue = mxSet-getPropertyValue (OUString(RTL_CONSTASCII_USTRINGPARAM(Style)) );
uno::Referencecontainer::XNamed xStyle (aValue, uno::UNO_QUERY);
if (xStyle.is())
msDescription.append (xStyle-getName());
}
else
msDescription.append (
-OUString::createFromAscii(no style));
+OUString(RTL_CONSTASCII_USTRINGPARAM(no style)) );
}
catch (::com::sun::star::beans::UnknownPropertyException)
{
msDescription.append (
-OUString::createFromAscii(unknown));
+OUString(RTL_CONSTASCII_USTRINGPARAM(unknown)) );
}
}
}
@@ -222,14 +222,14 @@ void DescriptionGenerator::AppendString (const ::rtl::OUString sString)
void DescriptionGenerator::AddLineProperties (void)
{
-AddProperty (OUString::createFromAscii (LineColor),
+AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM(LineColor)),
DescriptionGenerator::COLOR,
SIP_XA_LINECOLOR);
-AddProperty (OUString::createFromAscii (LineDashName),
+AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM(LineDashName)),
DescriptionGenerator::STRING,
SIP_XA_LINEDASH,
XATTR_LINEDASH);
-AddProperty (OUString::createFromAscii (LineWidth),
+AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM(LineWidth)),
DescriptionGenerator::INTEGER,
SIP_XA_LINEWIDTH);
}
@@ -242,7 +242,7 @@ void DescriptionGenerator::AddLineProperties (void)
*/
void DescriptionGenerator::AddFillProperties (void)
{
-AddProperty (OUString::createFromAscii (FillStyle),
+AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM(FillStyle)),
DescriptionGenerator::FILL_STYLE,
SIP_XA_FILLSTYLE);
}
@@ -252,7 +252,7 @@ void DescriptionGenerator::AddFillProperties (void)
void DescriptionGenerator::Add3DProperties (void)
{
-AddProperty (OUString::createFromAscii (D3DMaterialColor),
+AddProperty (OUString(RTL_CONSTASCII_USTRINGPARAM(D3DMaterialColor)),
DescriptionGenerator::COLOR,
RID_SVXSTR_A11Y_3D_MATERIAL_COLOR);
AddLineProperties ();
@@ -264,7 +264,7 @@ void
[Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM in svx
Is it correct to have the RTL_CONSTASCII_USTRINGPARAM directly in the *.hxx file. If so, why not do that also at other places? MPL 1.1 / GPLv3+ / LGPLv3+ Joost diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 4f1f256..c6e4117 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -48,47 +48,47 @@ //=== // const -#define RECOVERY_CMDPART_PROTOCOL ::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:) - -#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE ::rtl::OUString::createFromAscii(/doPrepareEmergencySave ) -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE ::rtl::OUString::createFromAscii(/doEmergencySave ) -#define RECOVERY_CMDPART_DO_RECOVERY::rtl::OUString::createFromAscii(/doAutoRecovery ) -#define RECOVERY_CMDPART_DO_CRASHREPORT ::rtl::OUString::createFromAscii(/doCrashReport ) -#define RECOVERY_CMDPART_DO_ENTRY_BACKUP::rtl::OUString::createFromAscii(/doEntryBackup ) -#define RECOVERY_CMDPART_DO_ENTRY_CLEANUP ::rtl::OUString::createFromAscii(/doEntryCleanUp ) - -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE ::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:/doPrepareEmergencySave) -#define RECOVERY_CMD_DO_EMERGENCY_SAVE ::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:/doEmergencySave ) -#define RECOVERY_CMD_DO_RECOVERY::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:/doAutoRecovery) -#define RECOVERY_CMD_DO_CRASHREPORT ::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:/doCrashReport ) -#define RECOVERY_CMD_DO_ENTRY_BACKUP::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:/doEntryBackup ) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP ::rtl::OUString::createFromAscii(vnd.sun.star.autorecovery:/doEntryCleanUp) - -#define SERVICENAME_PROGRESSFACTORY ::rtl::OUString::createFromAscii(com.sun.star.task.StatusIndicatorFactory) -#define SERVICENAME_URLTRANSFORMER ::rtl::OUString::createFromAscii(com.sun.star.util.URLTransformer) -#define SERVICENAME_RECOVERYCORE::rtl::OUString::createFromAscii(com.sun.star.frame.AutoRecovery ) -#define SERVICENAME_FOLDERPICKER::rtl::OUString::createFromAscii(com.sun.star.ui.dialogs.FolderPicker) -#define SERVICENAME_DESKTOP ::rtl::OUString::createFromAscii(com.sun.star.frame.Desktop ) - -#define PROP_PARENTWINDOW ::rtl::OUString::createFromAscii(Window ) -#define PROP_STATUSINDICATOR::rtl::OUString::createFromAscii(StatusIndicator ) -#define PROP_DISPATCHASYNCHRON ::rtl::OUString::createFromAscii(DispatchAsynchron) -#define PROP_SAVEPATH ::rtl::OUString::createFromAscii(SavePath ) -#define PROP_ENTRYID::rtl::OUString::createFromAscii(EntryID ) -#define PROP_ALLOWPARENTSHOW::rtl::OUString::createFromAscii(AllowParentShow ) - -#define STATEPROP_ID::rtl::OUString::createFromAscii(ID ) -#define STATEPROP_STATE ::rtl::OUString::createFromAscii(DocumentState) -#define STATEPROP_ORGURL::rtl::OUString::createFromAscii(OriginalURL ) -#define STATEPROP_TEMPURL ::rtl::OUString::createFromAscii(TempURL ) -#define STATEPROP_FACTORYURL::rtl::OUString::createFromAscii(FactoryURL ) -#define STATEPROP_TEMPLATEURL ::rtl::OUString::createFromAscii(TemplateURL ) -#define STATEPROP_TITLE ::rtl::OUString::createFromAscii(Title) -#define STATEPROP_MODULE::rtl::OUString::createFromAscii(Module ) - -#define RECOVERY_OPERATIONSTATE_START ::rtl::OUString::createFromAscii(start ) -#define RECOVERY_OPERATIONSTATE_STOP::rtl::OUString::createFromAscii(stop ) -#define RECOVERY_OPERATIONSTATE_UPDATE ::rtl::OUString::createFromAscii(update) +#define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( vnd.sun.star.autorecovery:)) + +#define RECOVERY_CMDPART_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( /doPrepareEmergencySave )) +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( /doEmergencySave )) +#define RECOVERY_CMDPART_DO_RECOVERY
Re: [Libreoffice] [PUSHED] Re: large swathes of commented/#if 0 code removed
I am not a perl expert, but I have figured out this command: perl -i.bak -wpl -e 's/ +$//g;' *.cxx The original files are save as *.bak and can be removed if the revoval of taling spaces was correct. Joost 2010/11/8 Caolán McNamara caol...@redhat.com On Mon, 2010-11-08 at 02:36 -0500, Kevin Hunter wrote: At 2:17am -0500 Mon, 08 Nov 2010, Kevin Hunter wrote: Subject says it all. Patch against three files under automation/source/ Pushed the substantial hacking out of the commented-out code in automation. Thanks. I'm holding back on the end of line whitespace stuff because all of our files have it, at least in line 4 :-). Maybe we can resolve all of those in one fell swoop somehow. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] EasyHack RTL_CONSTASCII_USTRINGPARAM in sc
MPL 1.1 / GPLv3+ / LGPLv3+
Joost
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 43ab458..b52a165 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -38,12 +38,12 @@ using namespace ooo::vba;
using namespace ooo::vba::office::MsoAnimationType;
-ScVbaAssistant::ScVbaAssistant( const uno::Reference XHelperInterface xParent, const uno::Reference uno::XComponentContext xContext ): ScVbaAssistantImpl_BASE( xParent, xContext )
+ScVbaAssistant::ScVbaAssistant( const uno::Reference XHelperInterface xParent, const uno::Reference uno::XComponentContext xContext ): ScVbaAssistantImpl_BASE( xParent, xContext ),
+m_sName( RTL_CONSTASCII_USTRINGPARAM( Clippit ) )
{
m_bIsVisible = sal_False;
m_nPointsLeft = 795;
m_nPointsTop = 248;
-m_sName = rtl::OUString::createFromAscii( Clippit );
m_nAnimation = msoAnimationIdle;
}
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 9e17b30..a1f0dc3 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -47,7 +47,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
ScVbaChart* pChart = static_cast ScVbaChart* ( moChartParent.get() );
if ( !pChart )
-throw uno::RuntimeException( rtl::OUString::createFromAscii(Can't access parent chart impl), uno::Reference uno::XInterface () );
+throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Can't access parent chart impl)), uno::Reference uno::XInterface () );
return pChart;
}
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index f3ea1b0..5b4df99 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -261,7 +261,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n
uno::Reference container::XNameContainer
ScVbaInterior::GetAttributeContainer()
{
-return uno::Reference container::XNameContainer ( m_xProps-getPropertyValue( rtl::OUString::createFromAscii( UserDefinedAttributes ) ), uno::UNO_QUERY_THROW );
+return uno::Reference container::XNameContainer ( m_xProps-getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UserDefinedAttributes )) ), uno::UNO_QUERY_THROW );
}
sal_Int32
ScVbaInterior::GetAttributeData( uno::Any aValue )
@@ -277,8 +277,8 @@ uno::Any
ScVbaInterior::SetAttributeData( sal_Int32 nValue )
{
xml::AttributeData aAttributeData;
-//aAttributeData.Namespace = rtl::OUString::createFromAscii( ooo.vba.excel.CellPatten);
-aAttributeData.Type = rtl::OUString::createFromAscii( sal_Int32 );
+//aAttributeData.Namespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ooo.vba.excel.CellPatten));
+aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( sal_Int32 ));
aAttributeData.Value = rtl::OUString::valueOf( nValue );
return uno::makeAny( aAttributeData );
}
@@ -301,7 +301,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString sName, const uno::
if( xNameContainer-hasByName( sName ) )
xNameContainer-removeByName( sName );
xNameContainer-insertByName( sName, aValue );
-m_xProps-setPropertyValue( rtl::OUString::createFromAscii( UserDefinedAttributes ), uno::makeAny( xNameContainer ) );
+m_xProps-setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UserDefinedAttributes )), uno::makeAny( xNameContainer ) );
}
}
// OOo do not support below API
@@ -323,7 +323,7 @@ ScVbaInterior::setPattern( const uno::Any _pattern ) throw (uno::RuntimeExcepti
SetMixedColor();
}
else
-throw uno::RuntimeException( rtl::OUString::createFromAscii( Invalid Pattern index ), uno::Reference uno::XInterface () );
+throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Invalid Pattern index )), uno::Reference uno::XInterface () );
}
Color
ScVbaInterior::GetBackColor()
@@ -371,7 +371,7 @@ ScVbaInterior::setPatternColor( const uno::Any _patterncolor ) throw (uno::Runt
SetMixedColor();
}
else
-throw uno::RuntimeException( rtl::OUString::createFromAscii( Invalid Pattern Color ), uno::Reference uno::XInterface () );
+throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Invalid Pattern Color )), uno::Reference uno::XInterface () );
}
uno::Any SAL_CALL
ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException)
@@ -394,7 +394,7 @@ ScVbaInterior::setPatternColorIndex( const uno::Any _patterncolorindex ) throw
setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) );
}
else
-throw uno::RuntimeException( rtl::OUString::createFromAscii( Invalid Pattern Color ), uno::Reference uno::XInterface () );
+throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( Invalid Pattern Color )), uno::Reference uno::XInterface () );
}
rtl::OUString
diff
[Libreoffice] EasyHack RTL_CONSTASCII_USTRINGPARAM in cui
MPL 1.1 / GPLv3+ / LGPLv3+
In ./cui/source/tabpages/numpages.cxx (line 2852):
String sMsg( RTL_CONSTASCII_USTRINGPARAM( Preview) );
Should that not be RTL_CONSTASCII_STRINGPARAM, because sMsg is a String and
not a OUString?
Joost
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 469c6ea..e1ddae0 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2730,9 +2730,9 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr rSmartTagMgr )
aSmartTagCaption = aSmartTagType;
const rtl::OUString aLBEntry = aSmartTagCaption +
- OUString::createFromAscii( () +
+ OUString(RTL_CONSTASCII_USTRINGPARAM( ()) +
aName +
- OUString::createFromAscii());
+ OUString(RTL_CONSTASCII_USTRINGPARAM()));
SvLBoxEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry );
if ( pEntry )
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0db81ac..582f34b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -91,7 +91,6 @@ using namespace com::sun::star::text;
using namespace com::sun::star::container;
using namespace com::sun::star::style;
using rtl::OUString;
-#define C2U(cChar) OUString::createFromAscii(cChar)
SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr);
@@ -126,7 +125,7 @@ ReferenceXDefaultNumberingProvider lcl_GetNumberingProvider()
{
Reference XMultiServiceFactory xMSF = ::comphelper::getProcessServiceFactory();
Reference XInterface xI = xMSF-createInstance(
-::rtl::OUString::createFromAscii( com.sun.star.text.DefaultNumberingProvider ) );
+::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( com.sun.star.text.DefaultNumberingProvider )) );
ReferenceXDefaultNumberingProvider xRet(xI, UNO_QUERY);
DBG_ASSERT(xRet.is(), service missing: \com.sun.star.text.DefaultNumberingProvider\);
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] easy task c++ to do
Hi, How can I contribute with an easy task? I am a medior C++ programmer, using Qt4 for the GUI. I am running Ubuntu in an virtual machine with only 20 Gb disk space. One bz2 was corrupted and I have downloaded that again manually. To get it running, I had to run autogen.sh as follows: ./autogen.sh --with-git --wwith-num-cpus=2 --disable-kde --disable-kde4 --without-junit Now it works. As a try I did one translation from German to English (Note that my English is poor): diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c66c678..6e7511d 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -221,7 +221,7 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet rCoreAttr maLbFrameDir.Hide(); } -// diese Page braucht ExchangeSupport +// This page needs ExchangeSupport. SetExchangeSupport(); FreeResource(); This code is contributed under the LGPLv3+ / MPL. Joost ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
