[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c2e2fbe6601ef14122371c380d91a48425a2b669
Author: Kohei Yoshida
Date: Fri Aug 2 23:47:39 2013 -0400
Fix subtotal functions in the status bar.
That is clearly a mistake.
Change-Id: I8f631f2ff63449a260091d7990f24ebaeea9c5f2
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 6a52d8c..b22b477 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2665,7 +2665,7 @@ class UpdateSubTotalHandler
void update(double fVal, bool bVal)
{
-if (!mrData.bError)
+if (mrData.bError)
return;
switch (mrData.eFunc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - configure.ac sal/osl solenv/gbuild vcl/aqua
configure.ac | 108 ---
sal/osl/unx/system.c |7 +-
solenv/gbuild/platform/macosx.mk |5 +
vcl/aqua/source/gdi/salnativewidgets.cxx |4 +
4 files changed, 70 insertions(+), 54 deletions(-)
New commits:
commit 33ed80c271d08b1756d2b60c3d62f474dff5f0c8
Author: Norbert Thiebaud
Date: Fri Aug 2 21:22:10 2013 -0500
the compiler of the 10.6 SDK is pretty confused wrt to aliasing warning
Change-Id: I7628a7cf862642e2fa85bf25bfc60cd7f06c2dbe
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 1becf71..cb27bf2 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -71,6 +71,11 @@ gb_COMPILERDEFS += \
endif
+ifneq ($(filter 1060,$(MACOSX_SDK_VERSION)),)
+gb_COMPILERNOOPTFLAGS := -O0 -fstrict-overflow
+
+endif
+
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double
endif
commit 1526e6fde2a82e494f1e7993eb8bbe1a08f5f375
Author: Norbert Thiebaud
Date: Fri Aug 2 21:08:14 2013 -0500
NSAppKitVersionNumber10_7 is not surprisingly not defined in 10.6 SDK
Change-Id: I68cba736de084a19d1dc92a3ccdd66b653f975c6
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx
b/vcl/aqua/source/gdi/salnativewidgets.cxx
index dcdba2b..8e5b24b 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -31,6 +31,10 @@
#include
#include "postmac.h"
+#ifndef NSAppKitVersionNumber10_7
+#define NSAppKitVersionNumber10_7 1138
+#endif
+
class AquaBlinker : public Timer
{
AquaSalFrame* mpFrame;
commit 0b468e9f16dbd6bdc06064672b8c78ca91f55ef9
Author: Norbert Thiebaud
Date: Fri Aug 2 21:07:18 2013 -0500
CFErrorRef is apparently not always initialized by the callee
on 10.6 SDK this coredumped in some case in CFRelease(cferror)
Maing sure that cferror is initialized to NULL
avoid the problem
Change-Id: I5624416867670bfd4c8db9b35e3b3d37494f79fd
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 20621a6..55a5bb5 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -169,12 +169,15 @@ int macxp_resolveAlias(char *path, int buflen)
CFStringRef cfpath = CFStringCreateWithCString( NULL, path,
kCFStringEncodingUTF8 );
CFURLRef cfurl = CFURLCreateWithFileSystemPath( NULL, cfpath,
kCFURLPOSIXPathStyle, false );
CFRelease( cfpath );
- CFErrorRef cferror;
+ CFErrorRef cferror = NULL;
CFDataRef cfbookmark = CFURLCreateBookmarkDataFromFile( NULL, cfurl,
&cferror );
CFRelease( cfurl );
if ( cfbookmark == NULL )
{
- CFRelease( cferror );
+ if(cferror)
+ {
+ CFRelease( cferror );
+ }
}
else
{
commit 3961c28659c961351d1b2b0d5cb5551d4940e8c3
Author: Norbert Thiebaud
Date: Fri Aug 2 21:05:13 2013 -0500
configure: openCl does not build on 10.6 mac default no in that case
Change-Id: I84b74cb9e9893996179b4b0229853903e29fe28d
diff --git a/configure.ac b/configure.ac
index bc6ddb5..7809430 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9995,13 +9995,17 @@ OPENCL_LIBS=
OPENCL_CFLAGS=
ENABLE_OPENCL=
AC_MSG_CHECKING([OpenCL])
-if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os =
Darwin; then
- # OS X
- AC_MSG_RESULT([yes, always on OS X])
- ENABLE_OPENCL=TRUE
- OPENCL_CFLAGS=
- OPENCL_LIBS="-framework OpenCL"
- AC_DEFINE(HAVE_FEATURE_OPENCL)
+if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os =
Darwin ; then
+# OS X
+if test "$with_open_sdk" = yes -o "$with_macosx_sdk" != "10.6" ; then
+AC_MSG_RESULT([yes, always on OS X])
+ENABLE_OPENCL=TRUE
+OPENCL_CFLAGS=
+OPENCL_LIBS="-framework OpenCL"
+AC_DEFINE(HAVE_FEATURE_OPENCL)
+else
+AC_MSG_RESULT([no])
+fi
elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then
AC_MSG_RESULT([no])
else
@@ -10028,49 +10032,49 @@ AC_SUBST(ENABLE_OPENCL)
# presenter minimizer extension?
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
if test "x$enable_ext_presenter_minimizer" != "xno" -a
"x$enable_extension_integration" != "xno"; then
- AC_MSG_RESULT([yes])
- ENABLE_MINIMIZER=YES
+AC_MSG_RESULT([yes])
+ENABLE_MINIMIZER=YES
else
- AC_MSG_RESULT([no])
- ENABLE_MINIMIZER=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
+AC_MSG_RESULT([no])
+ENABLE_MINIMIZER=NO
+SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
fi
AC_SUBST(ENABLE_MINIMIZER)
# pdf import?
AC_MSG_CHECKING([whether to build the PDF import])
if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE;
then
- AC_MSG_RESULT([yes])
- ENABLE_PDFIMPORT=TRUE
-
- dnl ===
- dnl Check for system poppler
- dnl ==
[Libreoffice-commits] core.git: sc/inc sc/qa
sc/inc/document.hxx |2 -
sc/qa/unit/data/ods/empty.ods |binary
sc/qa/unit/subsequent_export-test.cxx | 64 ++
3 files changed, 65 insertions(+), 1 deletion(-)
New commits:
commit ac0041248bffa53f8da338a84ed6defafcb5435e
Author: Kohei Yoshida
Date: Fri Aug 2 22:08:54 2013 -0400
Add a test that currently fails. We need to fix this bug.
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Change-Id: Ie09c668d952a6297ffe3c75e348c2a0348176bbe
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9c30744..90e0148 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -817,7 +817,7 @@ public:
SCCOL nCol2, SCROW nRow2, const ScMarkData&
rMark);
SC_DLLPUBLIC OUString GetString( SCCOL nCol, SCROW nRow, SCTAB nTab )
const;
-OUString GetString( const ScAddress& rPos ) const;
+SC_DLLPUBLIC OUString GetString( const ScAddress& rPos ) const;
/**
* Return a pointer to the string object stored in string cell.
diff --git a/sc/qa/unit/data/ods/empty.ods b/sc/qa/unit/data/ods/empty.ods
new file mode 100644
index 000..14b4232
Binary files /dev/null and b/sc/qa/unit/data/ods/empty.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index f881923..90ced45 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -28,9 +28,13 @@
#include "cellform.hxx"
#include "formulacell.hxx"
#include "tokenarray.hxx"
+#include "editutil.hxx"
#include "svx/svdoole2.hxx"
#include "tabprotection.hxx"
+#include "editeng/wghtitem.hxx"
+#include "editeng/postitem.hxx"
+#include "editeng/editdata.hxx"
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -55,6 +59,7 @@ public:
void testDataBarExportXLSX();
void testMiscRowHeightExport();
void testNamedRangeBugfdo62729();
+void testRichTextExportODS();
void testInlineArrayXLS();
void testEmbeddedChartXLS();
@@ -72,6 +77,7 @@ public:
CPPUNIT_TEST(testColorScaleExportXLSX);
CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST(testNamedRangeBugfdo62729);
+// CPPUNIT_TEST(testRichTextExportODS); This currently fails.
CPPUNIT_TEST(testInlineArrayXLS);
CPPUNIT_TEST(testEmbeddedChartXLS);
CPPUNIT_TEST(testFormulaReferenceXLS);
@@ -334,6 +340,64 @@ void ScExportTest::testNamedRangeBugfdo62729()
xDocSh->DoClose();
}
+void ScExportTest::testRichTextExportODS()
+{
+// Start with an empty document, put one edit text cell, and make sure it
+// survives the save and reload.
+ScDocShellRef xNewDocSh = loadDoc("empty.", ODS);
+ScDocument* pDoc = xNewDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+CPPUNIT_ASSERT_MESSAGE("This document should at least have one sheet.",
pDoc->GetTableCount() > 0);
+
+// Insert an edit text cell.
+OUString aCellText("Bold and Italic");
+ScFieldEditEngine& rEE = pDoc->GetEditEngine();
+rEE.SetText(aCellText);
+ESelection aSel;
+aSel.nStartPara = aSel.nEndPara = 0;
+
+{
+// Set the 'Bold' part bold.
+SfxItemSet aItemSet = rEE.GetEmptyItemSet();
+aSel.nStartPos = 0;
+aSel.nEndPos = 4;
+SvxWeightItem aWeight(WEIGHT_BOLD, ATTR_FONT_WEIGHT);
+aItemSet.Put(aWeight);
+rEE.QuickSetAttribs(aItemSet, aSel);
+}
+
+{
+// Set the 'Italic' part italic.
+SfxItemSet aItemSet = rEE.GetEmptyItemSet();
+SvxPostureItem aItalic(ITALIC_NORMAL, ATTR_FONT_POSTURE);
+aItemSet.Put(aItalic);
+aSel.nStartPos = 9;
+aSel.nEndPos = 15;
+rEE.QuickSetAttribs(aItemSet, aSel);
+}
+
+// Set this edit text to cell B2.
+pDoc->SetEditText(ScAddress(1,1,0), rEE.CreateTextObject());
+const EditTextObject* pEditText = pDoc->GetEditText(ScAddress(1,1,0));
+CPPUNIT_ASSERT_MESSAGE("B2 should be an edit text.", pEditText);
+
+// Now, save and reload this document.
+ScDocShellRef xDocSh = saveAndReload(xNewDocSh, ODS);
+xNewDocSh->DoClose();
+CPPUNIT_ASSERT(xDocSh.Is());
+pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one
sheet.", pDoc->GetTableCount() > 0);
+
+// Make sure the content of B2 is still intact.
+CPPUNIT_ASSERT_EQUAL(aCellText, pDoc->GetString(ScAddress(1,1,0)));
+
+pEditText = pDoc->GetEditText(ScAddress(1,1,0));
+CPPUNIT_ASSERT_MESSAGE("B2 should be an edit text.", pEditText);
+
+xDocSh->DoClose();
+}
+
namespace {
void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the ESC call 2013-08-01
Attending: Sophie, Tibby, Kohei, Astron, Norbert, Lionel, Bjoern, Joel, Cloph, Petr, Thorsten * Completed Action Items: + fdo#60858 needs input (Astron) + file svg / help->about issue in master as 4.2 MAB (Astron) * Pending Action Items: + improve configure to avoid versioning mistakes (Cloph) + come up with proposal for what to do about .debs (Rene, Bjoern, Petr) - some discussion around this issue, publishing plain tarballs has the rather unacceptable drawback that menu integration is missing - distro packages (for widely-deployed distro versions) usually not available at the time of upstream release + rotate easy hacks on https://wiki.documentfoundation.org/Development/Easy_Hacks (Joel) - first demo up from Robinson: http://testing.eagleeyet.net/mw/index.php/EasyHacks + polish & push chrome performance bits to a feature branch (Pierre-Eric) - ongoing + take a look at the gerrit migration (Norbert) - ongoing, waiting for migration to new vm + dig out the URL for GSOC travel funding (Cedric) * Release Engineering update (Petr) + 4.0.5 rc1 status - ongoing, needed Win32 & Linux build box setups. PPC is missing still. + 4.1.1 rc1 commit deadline Aug 5th + Writer / style translation issue evil status (Cedric) AI: * Cloph to poke andras wrt. translation updates / README AI: + Impress autoplay feature -> deferred to 4.1.2 (Thorsten) https://gerrit.libreoffice.org/4998 - needs triple review * when to update the on-line update code (Michael) AI: + upgrade 3.6 users to 4.0.5 once that is out (Thorsten/Kendy) AI: + propose download updates from inside LibO as GSoC idea (Astron) * API date issue (Lionel/Stephan) + patches pending on gerrit for -4-1 AI: + review & get them in before Monday: https://gerrit.libreoffice.org/5245 * QA update (Joel) + French BSA update * thx to Robinson / Sophie! * 6 reports so far * Sophie thinks it'll pick up in September + Contest result blog * http://joelmadero.wordpress.com/2013/07/30/contest-results/ + QA netbook blog * http://blog.documentfoundation.org/2013/08/01/libreoffice-qa-volunteers-armed-and-ready/ + Bibisected but not fixed (current count 51) * https://bugs.freedesktop.org/buglist.cgi?list_id=328050&status_whiteboard_type=anywordssubstr&query_format=advanced&status_whiteboard=bibisected%2C%20bibisect40%2C%20bibisect35&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=LibreOffice + Closing 3.6 MABs * Tommy did that, thanks a lot! + MAB handling: * by next major release, merge into single list * instead of individual mails, get daily MAB digest (Bjoern) * every 4-5 months, cleanse older, not-so-critical unfixed bugs from MAB list + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html +217-148(+69 overall) many thanks to the top five bug squashers: Urmas 15 Cor Nouws 14 ign_christian 11 Jesus Corrius 7 Lionel Elie Mamane 7 * UX input (Astron) + happy about new image and text toolbar from GSoC + looking into about:config UI now * Extra items: + suggestions for next API incompatibility release timing welcome (Bjoern) * Open 4.2 MAB + 2/2 2/2 1/1 + https://bugs.freedesktop.org/show_bug.cgi?id=65675 * Open 4.1 MAB + 8/68 11/64 3/55 7/52 7/48 2/42 4/39 5/37 7/32 3/26 3/23 4/17 12% 17% 5% 14% 15% + https://bugs.freedesktop.org/showdependencytree.cgi?id=60270&hide_resolved=1 * Open 4.0 MAB + 14/138 13/137 12/137 12/135 12/134 12/133 12/132 16/132 14/130 16/129 10% 9% 9% 9% 9% 9% 9% 12%11%13% + https://bugs.freedesktop.org/showdependencytree.cgi?id=54157&hide_resolved=1 * Bibisected bugs open: whiteboard 'bibsected' + 33/128 33/125 34/124 34/123 36/122 38/119 37/114 39/114 41/112 36/105 http://bit.ly/VQfF3Q * all bugs tagged with 'regression' + 301(+10) bugs open of 1801(+39) total * ~Component count net * Writer - 94 (+0) Libreoffice - 32 (+3) Spreadsheet - 30 (+0) Crashes - 24 (+0) Presentation - 24 (+0) Database - 23 (+0) Drawing - 14 (+1) Borders - 13 (-1) Migration - 4 (+0) BASIC - 2 (+0) + https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20&keywords_type=allwords&resolution=---&query_format=advanced&product=LibreOffice&list_id=36764 + Migration: https://bugs.freedesktop.org/showdependencytree.cgi?id=43489&hide_resolved=1 -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.o
Re: crash course in unittests
Hey Lionel, So you basically have two options. We already have a test concept where we open a file and execute a basic macro in it. You can find an example for it in sc/qa/extras/macros-test.cxx The other more flexible option is that you open a document and call the uno calls yourself from c++. The advantage of the second option is that it allows to add additional assertions and easier debugging but it takes a bit more code. Regards, Markus On Aug 2, 2013 5:59 PM, "Lionel Elie Mamane" wrote: > I'd appreciate some help in writing a unittest (subsequenttest?) for > https://bugs.freedesktop.org/67685 > > It is the second time such a bug crops up, I'd like to prevent it. > > Basically, we "just" need to open an .odb file, run a Basic macro (we > can set it to autorun on document load), then save the file, and > inspect the result. > > Thanks in advance! > > -- > Lionel > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmlcelli.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 7b319cb9c11bb0f0100c16b6268e580a1d6e64aa Author: Kohei Yoshida Date: Fri Aug 2 18:39:01 2013 -0400 fdo#67684: Store imported text style entries, else they won't get exported. Change-Id: Id784772e677e176622e75ff5ae33ab3eb78b1d9a diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 1fa56a0..de12fd2 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -404,6 +404,11 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons rFmt.maSelection.nStartPos = nBegin; rFmt.maSelection.nEndPos = nEnd; +// Store the used text styles for export. +ScSheetSaveData* pSheetData = ScModelObj::getImplementation(rXMLImport.GetModel())->GetSheetSaveData(); +ScAddress aCellPos = rXMLImport.GetTables().GetCurrentCellPos(); +pSheetData->AddTextStyle(rStyleName, aCellPos, rFmt.maSelection); + boost::scoped_ptr pPoolItem; sal_uInt16 nLastItemID = EE_CHAR_END + 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 46271, which changed state. Bug 46271 Summary: UI: Vertical scroll bar cannot be properly dragged under Mac OS X 10.7 and 10.8 https://bugs.freedesktop.org/show_bug.cgi?id=46271 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationCreateDialog.hxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 2382b8e8ec0ea65dc2a9ad1c401abe3be35a1487 Author: Tor Lillqvist Date: Sat Aug 3 01:18:16 2013 +0300 WaE: unused private fields Change-Id: I027e54cb3d43955fdcf67a327ab96a54cff6d28c diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index e126146..c7a705d 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -65,9 +65,6 @@ private: bool mbIsPreview; TabControl* mpTabControl; -OKButton* mpOKButton; -CancelButton* mpCancelButton; -HelpButton* mpHelpButton; CustomAnimationCreateTabPage* mpTabPages[5]; sal_Int16 mnEntranceId, mnEmphasisId, mnExitId, mnMPathId, mnMiscId; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |2
sd/source/ui/animations/CustomAnimation.hrc |1
sd/source/ui/animations/CustomAnimation.src |5
sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 113 ++-
sd/source/ui/animations/CustomAnimationCreateDialog.hxx |1
sd/uiconfig/simpress/ui/customanimationcreatedialog.ui | 158
sd/uiconfig/simpress/ui/customanimationcreatetab.ui | 86
7 files changed, 315 insertions(+), 51 deletions(-)
New commits:
commit 33983bdb94b63ffadd13bd10c976b4d3a6a5469c
Author: Katarina Behrens
Date: Fri Aug 2 13:19:47 2013 +0200
Put back the string lost in .ui migration
Change-Id: I5f91a2889bce8bfb7524d819dab9fdec13c689bf
diff --git a/sd/source/ui/animations/CustomAnimation.hrc
b/sd/source/ui/animations/CustomAnimation.hrc
index 55ff7b6..0003f30 100644
--- a/sd/source/ui/animations/CustomAnimation.hrc
+++ b/sd/source/ui/animations/CustomAnimation.hrc
@@ -93,6 +93,7 @@
#define STR_CUSTOMANIMATION_GRADUAL
RID_CUSTOMANIMATION_START+34
#define STR_CUSTOMANIMATION_TRIGGER
RID_CUSTOMANIMATION_START+35
#define STR_CUSTOMANIMATION_LIST_HELPTEXT
RID_CUSTOMANIMATION_START+36
+#define STR_CUSTOMANIMATION_USERPATH
RID_CUSTOMANIMATION_START+37
#define CM_WITH_CLICK 1
#define CM_WITH_PREVIOUS2
diff --git a/sd/source/ui/animations/CustomAnimation.src
b/sd/source/ui/animations/CustomAnimation.src
index 129eba7..74696b0 100644
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -384,6 +384,11 @@ String STR_CUSTOMANIMATION_LIST_HELPTEXT
Text [ en-US ] = "First select the slide element and then click 'Add...'
to add an animation effect.";
};
+String STR_CUSTOMANIMATION_USERPATH
+{
+Text [ en-US ] = "User paths";
+};
+
Image IMG_CUSTOMANIMATION_ON_CLICK
{
ImageBitmap = Bitmap { File = "click_16.png" ; };
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 138f8a0..a3f9a8a 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -206,7 +206,7 @@ private:
private:
CategoryListBox*mpLBEffects;
FixedText* mpFTSpeed;
-ListBox* mpCBSpeed;
+ListBox*mpCBSpeed;
CheckBox* mpCBXPReview;
CustomAnimationCreateDialog*mpParent;
@@ -256,7 +256,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage(
Window* pParent, Cus
get( mpCBSpeed, "effect_speed_list" );
get( mpCBXPReview, "auto_preview" );
-String sMotionPathLabel( SdResId( STR_USERPATH ) );
+String sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) );
sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
commit 9695f38ca4ab26b40524f2eade98c45f0360131d
Author: Katarina Behrens
Date: Thu Aug 1 20:39:39 2013 +0200
Converted custom animation popup dialog to .ui
Change-Id: I9a3d0036b7313867aff928e1f8d4d24dff552643
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index eb3953c..5706e46 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -80,6 +80,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/prntopts \
sd/uiconfig/simpress/ui/customanimationspanel \
+ sd/uiconfig/simpress/ui/customanimationcreatedialog \
+ sd/uiconfig/simpress/ui/customanimationcreatetab \
))
# vim: set noet sw=4 ts=4:
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 22dff09..138f8a0 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -64,14 +64,13 @@ const int EXIT = 2;
const int MOTIONPATH = 3;
const int MISCEFFECTS = 4;
-//extern void fillDurationComboBox( ComboBox* pBox );
-
//
class CategoryListBox : public ListBox
{
public:
CategoryListBox( Window* pParent, const ResId& rResId );
+CategoryListBox( Window* pParent );
~CategoryListBox();
virtual voidMouseButtonUp( const MouseEvent& rMEvt );
@@ -95,6 +94,18 @@ CategoryListBox::CategoryListBox( Window* pParent, const
ResId& rResId )
SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) );
}
+CategoryListBox::CategoryListBox( Window* pParent )
+: ListBox( pParent, WB_TABSTOP | WB_BORDER )
+{
+EnableUserDraw( sal_True );
+SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) );
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryListBox( Window
*pParent )
+{
+return new CategoryListBox( pPare
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67685, which changed state. Bug 67685 Summary: [DATALOSS] when basic, but not dialog, library loaded, save "forgets" to save the dialogs https://bugs.freedesktop.org/show_bug.cgi?id=67685 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/basic-cell-content.ods |binary
sc/qa/unit/subsequent_filters-test.cxx |7 +++
2 files changed, 7 insertions(+)
New commits:
commit 6ed555d9889982f95b0846a451c95c9abd54c498
Author: Kohei Yoshida
Date: Fri Aug 2 17:42:15 2013 -0400
Ensure that we import a value of 0 correctly.
Change-Id: I1ada3cf4a162bc4a85ce4e6d2cd0c13adf3156e6
diff --git a/sc/qa/unit/data/ods/basic-cell-content.ods
b/sc/qa/unit/data/ods/basic-cell-content.ods
index 70f6b6e..2b8c8bc 100644
Binary files a/sc/qa/unit/data/ods/basic-cell-content.ods and
b/sc/qa/unit/data/ods/basic-cell-content.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 61e3682..36ae617 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -46,6 +46,7 @@
#include "scitems.hxx"
#include "docsh.hxx"
#include "editutil.hxx"
+#include "cellvalue.hxx"
#include
#include
@@ -278,6 +279,12 @@ void ScFiltersTest::testBasicCellContentODS()
aStr = pDoc->GetString(1, 3, 0); // B4
CPPUNIT_ASSERT_EQUAL(OUString("A < B"), aStr);
+// Numeric value of 0.
+ScRefCellValue aCell;
+aCell.assign(*pDoc, ScAddress(1,4,0)); // B5
+CPPUNIT_ASSERT_MESSAGE("This cell must be numeric.", aCell.meType ==
CELLTYPE_VALUE);
+CPPUNIT_ASSERT_EQUAL(0.0, aCell.mfValue);
+
xDocSh->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basic/source
basic/source/uno/namecont.cxx | 45 +++---
1 file changed, 21 insertions(+), 24 deletions(-)
New commits:
commit a43a18edb0023b2a9533e719c8cf3dd2f894dad7
Author: Lionel Elie Mamane
Date: Fri Aug 2 23:35:20 2013 +0200
do *not* silently ignore errors when saving libraries
In case of error, it leads to *data* *loss*.
Change-Id: I80d806ef10a3364174eced3095ebf1ea217d75b4
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index e49a846..6257731 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1924,7 +1924,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference< embed::XSto
<< rLib.aName << "\". Exception: "
<< comphelper::anyToString(aError));
#endif
-return;
+throw;
}
}
@@ -1954,6 +1954,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference< embed::XSto
{
DBG_UNHANDLED_EXCEPTION();
// TODO: error handling
+throw;
}
}
}
@@ -2033,6 +2034,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference< embed::XSto
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
+throw;
}
}
@@ -2384,7 +2386,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const
OUString& Name )
<< "\". Exception: "
<< comphelper::anyToString(aError));
#endif
-return;
+throw;
}
}
@@ -2418,12 +2420,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const
OUString& Name )
aFile = aElementName;
aFile += ".";
aFile += maLibElementFileExtension;
-try
-{
-xElementStream = xLibraryStor->openStreamElement(
aFile, embed::ElementModes::READ );
-}
-catch(const uno::Exception& )
-{}
+xElementStream = xLibraryStor->openStreamElement( aFile,
embed::ElementModes::READ );
}
if ( xElementStream.is() )
@@ -2436,7 +2433,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const
OUString& Name )
"basic",
"couldn't open library element stream - attempted to"
" open library \"" << Name << '"');
-return;
+throw RuntimeException("couln't open library element
stream", *this);
}
}
else
commit fc9080a0c60f263d00eb7fcda72b3c0a2ebb
Author: Lionel Elie Mamane
Date: Fri Aug 2 23:33:47 2013 +0200
fdo#67685 open xSourceLibrariesStor only when needed
else it keeps loadLibrary from completing,
because the latter cannot open the storage
because it is already open in read/write mode.
Change-Id: Icd0aabfff6e67af2c38a8f9185f8485b46ab1516
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index edf724e..e49a846 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1870,21 +1870,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference< embed::XSto
DBG_UNHANDLED_EXCEPTION();
return;
}
-
-// open the source storage which might be used to copy yet-unmodified
libraries
-try
-{
-if ( mxStorage->hasByName( maLibrariesDir ) || bInplaceStorage )
-{
-xSourceLibrariesStor = mxStorage->openStorageElement(
maLibrariesDir,
- bInplaceStorage ?
embed::ElementModes::READWRITE : embed::ElementModes::READ );
-}
-}
-catch( const uno::Exception& )
-{
-DBG_UNHANDLED_EXCEPTION();
-return;
-}
}
int iArray = 0;
@@ -1984,6 +1969,21 @@ void SfxLibraryContainer::storeLibraries_Impl( const
uno::Reference< embed::XSto
// then we need to clean up the temporary storage we used for this
if ( bInplaceStorage && !sTempTargetStorName.isEmpty() )
{
+// open the source storage which might be used to copy yet-unmodified
libraries
+try
+{
+if ( mxStorage->hasByName( maLibrariesDir ) || bInplaceStorage )
+{
+xSourceLibrariesStor = mxStorage->openStorageElement(
maLibrariesDir,
+ bInplaceStorage ?
embed::ElementModes::READWRITE : embed::ElementModes::READ );
+}
+}
+catch( const uno::Exce
[Libreoffice-commits] core.git: starmath/source
starmath/source/ElementsDockingWindow.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d82433b0051a93632d66fdd6ab1df10166879c6e Author: Joren De Cuyper Date: Fri Aug 2 22:48:20 2013 +0200 fdo#67470 Element Dock: Subset icon missing in Set Operation section RID_XSUPSETY wasn't just listed, RID_XSUPSETEQY (notice the Q) was. Adding it adds it to the dock. Change-Id: I4c621aab74b424aacd5421ed90f35b42ae6e0a14 diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 5e2b229..893c2a0 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -81,7 +81,7 @@ const sal_uInt16 SmElementsControl::aSetOperations[] = RID_XINY, RID_XNOTINY, RID_XOWNSY, 0x, RID_XINTERSECTIONY, RID_XUNIONY, RID_XSETMINUSY, RID_XSLASHY, -RID_XSUBSETY, RID_XSUBSETEQY, RID_XSUPSETEQY, RID_XNSUBSETY, +RID_XSUBSETY, RID_XSUBSETEQY, RID_XSUPSETY, RID_XSUPSETEQY, RID_XNSUBSETY, RID_XNSUBSETEQY, RID_XNSUPSETY, RID_XNSUPSETEQY, 0x, RID_EMPTYSET, RID_ALEPH, RID_SETN, RID_SETZ, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - starmath/source
starmath/source/ElementsDockingWindow.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c549ac677ba6279387aca33c5117b8ee1461bd9e Author: Joren De Cuyper Date: Fri Aug 2 22:48:20 2013 +0200 fdo#67470 Element Dock: Subset icon missing in Set Operation section RID_XSUPSETY wasn't just listed, RID_XSUPSETEQY (notice the Q) was. Adding it adds it to the dock. Change-Id: I4c621aab74b424aacd5421ed90f35b42ae6e0a14 diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index ae1d785..2c3f33e 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -81,7 +81,7 @@ const sal_uInt16 SmElementsControl::aSetOperations[] = RID_XINY, RID_XNOTINY, RID_XOWNSY, 0x, RID_XINTERSECTIONY, RID_XUNIONY, RID_XSETMINUSY, RID_XSLASHY, -RID_XSUBSETY, RID_XSUBSETEQY, RID_XSUPSETEQY, RID_XNSUBSETY, +RID_XSUBSETY, RID_XSUBSETEQY, RID_XSUPSETY, RID_XSUPSETEQY, RID_XNSUBSETY, RID_XNSUBSETEQY, RID_XNSUPSETY, RID_XNSUPSETEQY, 0x, RID_EMPTYSET, RID_ALEPH, RID_SETN, RID_SETZ, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Lionel Elie Mamane changed: What|Removed |Added Depends on||67685 --- Comment #64 from Lionel Elie Mamane --- Adding bug 67685: dataloss -- 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: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk|1
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/ResourceIds.hrc |1
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |4
chart2/source/controller/dialogs/dlg_ObjectProperties.src | 33
chart2/uiconfig/ui/attributedialog.ui | 106 ++
6 files changed, 108 insertions(+), 38 deletions(-)
New commits:
commit 55d7d03b0c70a8d8db61418a88559b8480a2e38d
Author: Caolán McNamara
Date: Fri Aug 2 22:30:29 2013 +0200
convert attributes wrapper dialog to .ui
currently unresizable until all possible tabpages that can be inserted into
it
get converted over
Change-Id: I1e7d28cf2f2a04ca2c596136b7d26626058f2e4b
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index c60a3f4..ce4309f 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
chart2/source/controller/dialogs/dlg_InsertLegend.src \
chart2/source/controller/dialogs/dlg_InsertTitle.src \
-chart2/source/controller/dialogs/dlg_ObjectProperties.src \
chart2/source/controller/dialogs/dlg_ShapeFont.src \
chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
chart2/source/controller/dialogs/dlg_View3D.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 76ab924..1ad18c7 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
))
$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
+ chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
chart2/uiconfig/ui/smoothlinesdlg \
diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc
b/chart2/source/controller/dialogs/ResourceIds.hrc
index 09aa8d2..209cee0 100644
--- a/chart2/source/controller/dialogs/ResourceIds.hrc
+++ b/chart2/source/controller/dialogs/ResourceIds.hrc
@@ -32,7 +32,6 @@
#define DLG_LEGEND 835
#define DLG_TITLE 834
#define DLG_3D_VIEW 752
-#define DLG_OBJECT_PROPERTIES 903
#define DLG_SPLINE_PROPERTIES 904
#define DLG_DATA_TRENDLINE 841
#define DLG_DATA_YERRORBAR 842
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index bacd18e..d7c6587 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -335,7 +335,7 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
const ViewElementListProvider*
pViewElementListProvider,
const uno::Reference<
util::XNumberFormatsSupplier >& xNumberFormatsSupplier
)
-: SfxTabDialog(pParent, SchResId(DLG_OBJECT_PROPERTIES), pAttr)
+: SfxTabDialog(pParent, "AttributeDialog",
"modules/schart/ui/attributedialog.ui", pAttr)
, eObjectType(pDialogParameter->getObjectType())
, nDlgType(nNoArrowNoShadowDlg)
, nPageType(0)
@@ -347,8 +347,6 @@ SchAttribTabDlg::SchAttribTabDlg(Window* pParent,
, m_fAxisMinorStepWidthForErrorBarDecimals(0.1)
, m_bOKPressed(false)
{
-FreeResource();
-
NumberFormatterWrapper aNumberFormatterWrapper( xNumberFormatsSupplier );
m_pNumberFormatter = aNumberFormatterWrapper.getSvNumberFormatter();
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.src
b/chart2/source/controller/dialogs/dlg_ObjectProperties.src
deleted file mode 100644
index e0d173e..000
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.src
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "ResourceIds.hrc"
-
-TabDialog DLG_OBJECT_PROPERTIES
-{
-Outp
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6d/231def8163b1404a40cfa8ff054c27e8c1df95
6d/231def8163b1404a40cfa8ff054c27e8c1df95 |1 + 1 file changed, 1 insertion(+) New commits: commit ab42571a9ceed0e6dda19be6a21f11ddba42b6e0 Author: Caolán McNamara Date: Fri Aug 2 22:37:45 2013 +0200 Notes added by 'git notes add' diff --git a/6d/231def8163b1404a40cfa8ff054c27e8c1df95 b/6d/231def8163b1404a40cfa8ff054c27e8c1df95 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/6d/231def8163b1404a40cfa8ff054c27e8c1df95 @@ -0,0 +1 @@ +ignore: fixed ___ 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' - c1/5b0362495a8755761990c9284fd0cfb25fe39c
c1/5b0362495a8755761990c9284fd0cfb25fe39c |1 + 1 file changed, 1 insertion(+) New commits: commit e5a8586d2eb6ad53487e18a5b0f3d48ac25d Author: Caolán McNamara Date: Fri Aug 2 22:36:09 2013 +0200 Notes added by 'git notes add' diff --git a/c1/5b0362495a8755761990c9284fd0cfb25fe39c b/c1/5b0362495a8755761990c9284fd0cfb25fe39c new file mode 100644 index 000..5283a6a --- /dev/null +++ b/c1/5b0362495a8755761990c9284fd0cfb25fe39c @@ -0,0 +1 @@ +prefer: fc7333c77bad1ddf5baab81a0d93eca43b6804f6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 16 source/text/shared/01/05200100.xhp | 69 + 2 files changed, 33 insertions(+), 52 deletions(-) New commits: commit 33f8f1984f799c43d7bd1f8a0aee922c03d824e7 Author: Caolán McNamara Date: Fri Aug 2 22:14:39 2013 +0200 update help ids for line properties tabpage .ui conversion Change-Id: Ie42e1498ac0bde202faf1ae67df41cd94ffb90bb diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index cf94b55..0aee7d1 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2312,7 +2312,6 @@ HID_LETTER_PAGE9,53277, HID_LICENSEDIALOG,40369, HID_LINE_DEF,33803, HID_LINE_ENDDEF,33804, -HID_LINE_LINE,33802, HID_LINGU_ADD_WORD,53430, HID_LINGU_AUTOCORR,53433, HID_LINGU_IGNORE_WORD,53431, @@ -6847,8 +6846,6 @@ svx_CheckBox_RID_SVXPAGE_FOOTER_CB_HEIGHT_DYN,701137935, svx_CheckBox_RID_SVXPAGE_FOOTER_CB_SHARED,701137940, svx_CheckBox_RID_SVXPAGE_FOOTER_CB_TURNON,701137930, svx_CheckBox_RID_SVXPAGE_HYPERLINK_INTERNET_CBX_ANONYMOUS,704447499, -svx_CheckBox_RID_SVXPAGE_LINE_CBX_SYNCHRONIZE,701547521, -svx_CheckBox_RID_SVXPAGE_LINE_CB_SYMBOL_RATIO,701547544, svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905, svx_CheckBox_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE,704857099, svx_CheckBox_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE,702137366, @@ -7112,11 +7109,6 @@ svx_ListBox_RID_SVXPAGE_LINEEND_DEF_LB_LINEENDS,701582849, svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_LINESTYLES,701566466, svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_TYPE_1,701566467, svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_TYPE_2,701566465, -svx_ListBox_RID_SVXPAGE_LINE_LB_COLOR,701550081, -svx_ListBox_RID_SVXPAGE_LINE_LB_EDGE_STYLE,701550085, -svx_ListBox_RID_SVXPAGE_LINE_LB_END_STYLE,701550084, -svx_ListBox_RID_SVXPAGE_LINE_LB_LINE_STYLE,701550082, -svx_ListBox_RID_SVXPAGE_LINE_LB_START_STYLE,701550083, svx_ListBox_RID_SVXPAGE_MEASURE_LB_UNIT,703352321, svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS,705498935, svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN,705498948, @@ -7136,10 +7128,8 @@ svx_ListBox_RID_SVX_FONT_SUBSTITUTION_LB_FONTNAME,701009432, svx_ListBox_RID_SVX_MDLG_DOCRECOVERY_BROKEN_LB_BROKEN_FILELIST,1237782019, svx_ListBox_RID_SVX_MDLG_HANGULHANJA_EDIT_LB_BOOK,1237667329, svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT,2311860263, -svx_MenuButton_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,701558810, svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE,705507642, svx_MenuButton_RID_SVXPAGE_MENUS_BTN_CHANGE_ENTRY,705507646, -svx_Menu_RID_SVXPAGE_LINE_MB_SYMBOL_BITMAP,537296896, svx_MetricField_OFA_TP_VIEW_MF_SELECTION,810523208, svx_MetricField_OFA_TP_VIEW_MF_WINDOWSIZE,810523158, svx_MetricField_RID_SVXDLG_BMPMASK_SP_1,3391953410, @@ -7199,12 +7189,6 @@ svx_MetricField_RID_SVXPAGE_GRFCROP_MF_WIDTHZOOM,704616981, svx_MetricField_RID_SVXPAGE_LINE_DEF_MTR_FLD_DISTANCE,701569537, svx_MetricField_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_1,701569539, svx_MetricField_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_2,701569540, -svx_MetricField_RID_SVXPAGE_LINE_MF_SYMBOL_HEIGHT,701553175, -svx_MetricField_RID_SVXPAGE_LINE_MF_SYMBOL_WIDTH,701553174, -svx_MetricField_RID_SVXPAGE_LINE_MTR_FLD_END_WIDTH,701553154, -svx_MetricField_RID_SVXPAGE_LINE_MTR_FLD_LINE_WIDTH,701553153, -svx_MetricField_RID_SVXPAGE_LINE_MTR_FLD_START_WIDTH,701553155, -svx_MetricField_RID_SVXPAGE_LINE_MTR_LINE_TRANSPARENT,701553157, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_DECIMALPLACES,703355398, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE1_LEN,703355396, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE2_LEN,703355397, diff --git a/source/text/shared/01/05200100.xhp b/source/text/shared/01/05200100.xhp index 2d88bbc..20513c5 100644 --- a/source/text/shared/01/05200100.xhp +++ b/source/text/shared/01/05200100.xhp @@ -30,67 +30,64 @@ -Line -Set the formatting options for the selected line or the line that you want to draw. You can also add arrowheads to a line, or change chart symbols. +Line +Set the formatting options for the selected line or the line that you want to draw. You can also add arrowheads to a line, or change chart symbols. Line properties - -Styles -Select the line style that you want to use. +Styles +Select the line style that you want to use. - -Colors -Select a color for the line. +Colors +Select a color for the line. - -Widths -Select the width for the line. You can append a measurement unit. A zero line width results in a hairline with a width of one pixel of the output medium. +Widths +Select the width for the line. You can append a measurement unit. A zero line width results in a hairline with a width of one pixel of the output medium. -Transparency -Enter the transparency of the line, where 100% corresponds to completely transparent and 0% to completely opaque. +Transparency +Enter the transparency of the line, where 100% corresponds to completely transparent and 0% to completely opaque. The Line tab of the Data Serie
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 973094a999abd15835e76cc69087edcc320d53d4 Author: Caolán McNamara Date: Fri Aug 2 22:14:39 2013 +0200 Updated core Project: help 33f8f1984f799c43d7bd1f8a0aee922c03d824e7 diff --git a/helpcontent2 b/helpcontent2 index 07886e6..33f8f19 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 07886e67f36d3da3e36fc41e612ed0bb7593d6c1 +Subproject commit 33f8f1984f799c43d7bd1f8a0aee922c03d824e7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig svx/source
cui/uiconfig/ui/linetabpage.ui | 32 ++
svx/source/dialog/dlgctrl.cxx | 72 -
2 files changed, 55 insertions(+), 49 deletions(-)
New commits:
commit ae0493ccfe7c232557fb87eef4d0444709d8b729
Author: Caolán McNamara
Date: Fri Aug 2 22:07:59 2013 +0200
got the ctors the wrong way around, fix resid loaded previews
Change-Id: I0a00a5bbd4616fd72e947cacd72ef23d38147638
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index c8d1e39..ba848b9 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1838,32 +1838,19 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent,
const ResId& rResId )
{
InitSettings( sal_True, sal_True );
-mpLineObjA = new SdrPathObj(OBJ_LINE);
-mpLineObjA->SetModel(&getModel());
-
-mpLineObjB = new SdrPathObj(OBJ_PLIN);
-mpLineObjB->SetModel(&getModel());
-
-mpLineObjC = new SdrPathObj(OBJ_PLIN);
-mpLineObjC->SetModel(&getModel());
-}
-
-void SvxXLinePreview::Resize()
-{
-SvxPreviewBase::Resize();
-
const Size aOutputSize(GetOutputSize());
const sal_Int32 nDistance(500L);
const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
-// create DrawObectA
+// create DrawObjectA
const sal_Int32 aYPosA(aOutputSize.Height() / 2);
const basegfx::B2DPoint aPointA1( nDistance, aYPosA);
const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength *
14) / 20), aYPosA );
basegfx::B2DPolygon aPolygonA;
aPolygonA.append(aPointA1);
aPolygonA.append(aPointA2);
-mpLineObjA->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonA));
+mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA));
+mpLineObjA->SetModel(&getModel());
// create DrawObectB
const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4);
@@ -1875,42 +1862,37 @@ void SvxXLinePreview::Resize()
aPolygonB.append(aPointB1);
aPolygonB.append(aPointB2);
aPolygonB.append(aPointB3);
-mpLineObjB->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonB));
+mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB));
+mpLineObjB->SetModel(&getModel());
// create DrawObectC
-basegfx::B2DPolygon aPolygonC;
const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1);
const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength *
1) / 20), aYPosB2 );
const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength *
1) / 20), aYPosB1 );
+basegfx::B2DPolygon aPolygonC;
aPolygonC.append(aPointC1);
aPolygonC.append(aPointC2);
aPolygonC.append(aPointC3);
-mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC));
+mpLineObjC = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonC));
+mpLineObjC->SetModel(&getModel());
}
-SvxXLinePreview::SvxXLinePreview( Window* pParent)
-: SvxPreviewBase( pParent ),
-mpLineObjA( 0L ),
-mpLineObjB( 0L ),
-mpLineObjC( 0L ),
-mpGraphic( 0L ),
-mbWithSymbol( sal_False )
+void SvxXLinePreview::Resize()
{
-const Size aOutputSize(GetOutputSize());
-InitSettings( true, true );
+SvxPreviewBase::Resize();
+const Size aOutputSize(GetOutputSize());
const sal_Int32 nDistance(500L);
const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
-// create DrawObjectA
+// create DrawObectA
const sal_Int32 aYPosA(aOutputSize.Height() / 2);
const basegfx::B2DPoint aPointA1( nDistance, aYPosA);
const basegfx::B2DPoint aPointA2( aPointA1.getX() + ((nAvailableLength *
14) / 20), aYPosA );
basegfx::B2DPolygon aPolygonA;
aPolygonA.append(aPointA1);
aPolygonA.append(aPointA2);
-mpLineObjA = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aPolygonA));
-mpLineObjA->SetModel(&getModel());
+mpLineObjA->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonA));
// create DrawObectB
const sal_Int32 aYPosB1((aOutputSize.Height() * 3) / 4);
@@ -1922,26 +1904,44 @@ mbWithSymbol( sal_False )
aPolygonB.append(aPointB1);
aPolygonB.append(aPointB2);
aPolygonB.append(aPointB3);
-mpLineObjB = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonB));
-mpLineObjB->SetModel(&getModel());
+mpLineObjB->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonB));
// create DrawObectC
+basegfx::B2DPolygon aPolygonC;
const basegfx::B2DPoint aPointC1( aPointB3.getX() + nDistance, aYPosB1);
const basegfx::B2DPoint aPointC2( aPointC1.getX() + ((nAvailableLength *
1) / 20), aYPosB2 );
const basegfx::B2DPoint aPointC3( aPointC2.getX() + ((nAvailableLength *
1) / 20), aYPosB1 );
-basegfx::B2DPolygon aPolygonC;
aPolygonC.append(aPointC1);
aPolygonC.append(aPointC2);
aPolygonC.append(aPointC3);
-mpLineObjC = new SdrPathObj(OBJ_PLIN, basegfx::B2DPolyPolygon(aPolygonC));
+mpLineObjC->SetPathPoly(basegfx::B2DPolyPo
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Cor Nouws changed: What|Removed |Added Depends on||67221 --- Comment #63 from Cor Nouws --- adding Bug 67221 - [FILESAVE] Saving xls file which has cell with formula result #DIV/0! deleted formula, data loss So it get's on the radar of the appropriate developer ;) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source
sc/inc/column.hxx | 11 -
sc/inc/documentimport.hxx | 13 +
sc/source/core/data/column2.cxx| 35
sc/source/core/data/column3.cxx| 260 +
sc/source/core/data/documentimport.cxx | 231 +++--
sc/source/filter/xml/xmlcelli.cxx | 70 +---
sc/source/filter/xml/xmlcelli.hxx |4
sc/source/filter/xml/xmlimprt.cxx | 12 +
sc/source/filter/xml/xmlimprt.hxx |7
sc/source/filter/xml/xmlsubti.cxx | 14 -
10 files changed, 438 insertions(+), 219 deletions(-)
New commits:
commit f3d2b533122f918929f3ef5a77af4972582a5960
Author: Kohei Yoshida
Date: Fri Aug 2 02:00:27 2013 -0400
fdo#67099: Don't use edit engine for a single unformatted paragraph.
which is most common, and using edit engine for it would decrease
loading performance.
Change-Id: I65c20eef96c88edd8eb07c73c27716c4f03c4cda
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 318f591..1fa56a0 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -158,10 +158,10 @@ ScXMLTableRowCellContext::ScXMLTableRowCellContext(
ScXMLImport& rImport,
bFormulaTextResult(false),
mbPossibleErrorCell(false),
mbCheckWithCompilerForError(false),
-mbEditEngineHasText(false)
+mbEditEngineHasText(false),
+mbHasFormatRuns(false)
{
rtl::math::setNan(&fValue); // NaN by default
-mpEditEngine->Clear();
rXMLImport.SetRemoveLastChar(false);
rXMLImport.GetTables().AddColumn(bTempIsCovered);
@@ -354,6 +354,7 @@ void ScXMLTableRowCellContext::PushParagraphSpan(const
OUString& rSpan, const OU
void ScXMLTableRowCellContext::PushParagraphField(SvxFieldData* pData, const
OUString& rStyleName)
{
+mbHasFormatRuns = true;
maFields.push_back(new Field(pData));
Field& rField = maFields.back();
@@ -396,6 +397,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin,
sal_Int32 nEnd, cons
const ScXMLEditAttributeMap& rEditAttrMap =
GetScImport().GetEditAttributeMap();
+mbHasFormatRuns = true;
maFormats.push_back(new ParaFormat(*mpEditEngine));
ParaFormat& rFmt = maFormats.back();
rFmt.maSelection.nStartPara = rFmt.maSelection.nEndPara = mnCurParagraph;
@@ -591,6 +593,14 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32
nBegin, sal_Int32 nEnd, cons
rFmt.maItemSet.Put(*pPoolItem);
}
+OUString ScXMLTableRowCellContext::GetFirstParagraph() const
+{
+if (maFirstParagraph.isEmpty())
+return mpEditEngine->GetText(0);
+
+return maFirstParagraph;
+}
+
void ScXMLTableRowCellContext::PushParagraphFieldDate(const OUString&
rStyleName)
{
PushParagraphField(new SvxDateField, rStyleName);
@@ -619,12 +629,24 @@ void ScXMLTableRowCellContext::PushParagraphEnd()
// EditEngine always has at least one paragraph even when its content is
empty.
if (mbEditEngineHasText)
+{
+if (!maFirstParagraph.isEmpty())
+{
+mpEditEngine->SetText(maFirstParagraph);
+maFirstParagraph = OUString();
+}
mpEditEngine->InsertParagraph(mpEditEngine->GetParagraphCount(),
maParagraph.makeStringAndClear());
-else
+}
+else if (mbHasFormatRuns)
{
mpEditEngine->SetText(maParagraph.makeStringAndClear());
mbEditEngineHasText = true;
}
+else if (mnCurParagraph == 0)
+{
+maFirstParagraph = maParagraph.makeStringAndClear();
+mbEditEngineHasText = true;
+}
++mnCurParagraph;
}
@@ -1018,7 +1040,7 @@ void ScXMLTableRowCellContext::PutTextCell( const
ScAddress& rCurrentPos,
if (maStringValue)
aCellString = *maStringValue;
else if (mbEditEngineHasText)
-aCellString = mpEditEngine->GetText(0);
+aCellString = GetFirstParagraph();
else if ( nCurrentCol > 0 && pOUText && !pOUText->isEmpty() )
aCellString = *pOUText;
else
@@ -1059,10 +1081,10 @@ void ScXMLTableRowCellContext::PutTextCell( const
ScAddress& rCurrentPos,
}
else if (mbEditEngineHasText)
{
-if (maFields.empty() && maFormats.empty() &&
mpEditEngine->GetParagraphCount() == 1)
+if (!maFirstParagraph.isEmpty())
{
// This is a normal text without format runs.
-rDoc.setStringCell(rCurrentPos, mpEditEngine->GetText());
+rDoc.setStringCell(rCurrentPos, maFirstParagraph);
}
else
{
@@ -1441,7 +1463,8 @@ void ScXMLTableRowCellContext::HasSpecialCaseFormulaText()
if (!mbEditEngineHasText || mbNewValueType)
return;
-OUString aStr = mpEditEngine->GetText(0);
+OUString aStr = GetFirstParagraph();
+
if (aStr.isEmpty() || aStr.startsWith("Err:"))
mbPossibleErrorC
[Libreoffice-commits] core.git: 3 commits - include/formula reportdesign/source sc/source svx/source
include/formula/IControlReferenceHandler.hxx |2 -
reportdesign/source/ui/dlg/Formula.cxx |2 -
reportdesign/source/ui/inc/Formula.hxx |2 -
sc/source/ui/formdlg/formula.cxx |2 -
sc/source/ui/inc/anyrefdg.hxx | 12 -
sc/source/ui/inc/formula.hxx |2 -
sc/source/ui/miscdlgs/anyrefdg.cxx | 30
sc/source/ui/sidebar/CellLineStyleControl.cxx | 31 +
sc/source/ui/sidebar/CellLineStyleControl.hxx |3 --
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 10 +++-
sc/source/ui/sidebar/CellLineStyleValueSet.hxx |6 +++-
svx/source/svdraw/svdundo.cxx |4 +--
12 files changed, 49 insertions(+), 57 deletions(-)
New commits:
commit eace5e0a1c4bab37699429447b1a17e3c9410503
Author: Caolán McNamara
Date: Fri Aug 2 16:49:24 2013 +0200
remove last uses of XubString in sc
Change-Id: I44c42f0268b0d7c2e77ab7e807610d39b7b7ea56
diff --git a/include/formula/IControlReferenceHandler.hxx
b/include/formula/IControlReferenceHandler.hxx
index bee4bac..cc22e45 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
@@ -28,7 +28,7 @@ namespace formula
class FORMULA_DLLPUBLIC SAL_NO_VTABLE IControlReferenceHandler
{
public:
-virtual void ShowReference(const String& _sRef) = 0;
+virtual void ShowReference(const OUString& _sRef) = 0;
virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL )
= 0;
virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton =
NULL ) = 0;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx
b/reportdesign/source/ui/dlg/Formula.cxx
index 84330da..6abf2f1 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -173,7 +173,7 @@ IFunctionManager* FormulaDialog::getFunctionManager()
return m_aFunctionManager.get();
}
//
-
-void FormulaDialog::ShowReference(const String& /*_sRef*/)
+void FormulaDialog::ShowReference(const OUString& /*_sRef*/)
{
}
//
-
diff --git a/reportdesign/source/ui/inc/Formula.hxx
b/reportdesign/source/ui/inc/Formula.hxx
index fcfbc6c..c551bbd 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -87,7 +87,7 @@ public:
virtual ::std::auto_ptr
convertToTokenArray(const ::com::sun::star::uno::Sequence<
::com::sun::star::sheet::FormulaToken >& _aTokenList);
// IControlReferenceHandler
-virtual void ShowReference(const String& _sRef);
+virtual void ShowReference(const OUString& _sRef);
virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton*
pButton = NULL );
virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton*
pButton = NULL );
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 37ee0e2..25ae7d0 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -497,7 +497,7 @@ void ScFormulaDlg::showReference(const String& _sFormula)
{
ShowReference(_sFormula);
}
-void ScFormulaDlg::ShowReference(const String& _sFormula)
+void ScFormulaDlg::ShowReference(const OUString& _sFormula)
{
m_aHelper.ShowReference(_sFormula);
}
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index bba97a7..660de08 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -75,12 +75,12 @@ public:
ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings);
~ScFormulaReferenceHelper();
-voidShowSimpleReference( const XubString& rStr );
-voidShowFormulaReference( const XubString& rStr );
+voidShowSimpleReference(const OUString& rStr);
+voidShowFormulaReference(const OUString& rStr);
boolParseWithNames( ScRangeList& rRanges, const String&
rStr, ScDocument* pDoc );
voidInit();
-voidShowReference( const XubString& rStr );
+voidShowReference(const OUString& rStr);
voidReleaseFocus( formula::RefEdit* pEdit,
formula::RefButton* pButton = NULL );
voidHideReference( bool bDoneRefMode = true );
voidRefInputStart( formula::RefEdit* pEdit,
formula::RefButton* pButton = NULL );
@@ -136,8 +136,8 @@ protected:
virtual voidRefInputStart( formula::RefEdit* pEdit,
formula::RefButton* pButton = NULL );
virtual voidRefInputDone( sal_Bool bForced = fa
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2.hxx |4 -
basctl/source/basicide/baside2b.cxx | 84 +++-
2 files changed, 18 insertions(+), 70 deletions(-)
New commits:
commit 6c6c281267a357d3370a699106e68dbce3b9409e
Author: Gergo Mocsi
Date: Fri Aug 2 17:36:29 2013 +0200
GSOC work, KeyInput instead of PreNotify
CodeCompleteListBox now uses KeyInput instead of PreNotify to handle key
events.
The cursor is visible, arrow keys navigate the listbox correctly.
Change-Id: Ia0d5c5c48858d345dc4b4886ece1db618bdfc67c
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 5618f76..68f16a1 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -491,9 +491,7 @@ public:
void InsertSelectedEntry(); //insert the selected entry
DECL_LINK(ImplDoubleClickHdl, void*);
-//DECL_LINK(ImplSelectionChangeHdl, void*);
-
-virtual long PreNotify( NotifyEvent& rNEvt );
+DECL_LINK(ImplSelectHdl, void*);
protected:
virtual void KeyInput( const KeyEvent& rKeyEvt );
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index fe9da85..eba 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -502,11 +502,13 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
// see if there is an accelerator to be processed first
bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
-//sal_Unicode aChar = rKEvt.GetKeyCode().GetCode();
-if( pCodeCompleteWnd->IsVisible() )
+if( pCodeCompleteWnd->IsVisible() &&
CodeCompleteOptions::IsCodeCompleteOn() )
{
std::cerr << "EditorWindow::KeyInput" << std::endl;
pCodeCompleteWnd->GetListBox()->KeyInput(rKEvt);
+if( rKEvt.GetKeyCode().GetCode() == KEY_UP
+|| rKEvt.GetKeyCode().GetCode() == KEY_DOWN )
+return;
}
if( (rKEvt.GetKeyCode().GetCode() == KEY_SPACE ||
@@ -2546,7 +2548,7 @@ CodeCompleteListBox::CodeCompleteListBox(
CodeCompleteWindow* pPar )
pCodeCompleteWindow( pPar )
{
SetDoubleClickHdl(LINK(this, CodeCompleteListBox, ImplDoubleClickHdl));
-//SetSelectHdl(LINK(this, CodeCompleteListBox, ImplSelectionChangeHdl));
+SetSelectHdl(LINK(this, CodeCompleteListBox, ImplSelectHdl));
}
IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl)
@@ -2555,11 +2557,11 @@ IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl)
return 0;
}
-/*IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectionChangeHdl)
-{
+IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl)
+{//give back the focus to the parent
pCodeCompleteWindow->pParent->GrabFocus();
return 0;
-}*/
+}
void CodeCompleteListBox::InsertSelectedEntry()
{
@@ -2597,65 +2599,6 @@ void CodeCompleteListBox::InsertSelectedEntry()
}
}
-long CodeCompleteListBox::PreNotify( NotifyEvent& rNEvt )
-{
-if( rNEvt.GetType() == EVENT_KEYINPUT )
-{
-std::cerr << "CodeCompleteListBox::PreNotify" << std::endl;
-KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
-sal_Unicode aChar = aKeyEvt.GetKeyCode().GetCode();
-if( ( aChar >= KEY_A ) && ( aChar <= KEY_Z ) )
-{
-pCodeCompleteWindow->pParent->GetEditView()->InsertText(
OUString(aKeyEvt.GetCharCode()) );
-aFuncBuffer.append(aKeyEvt.GetCharCode());
-SetVisibleEntries();
-
//pCodeCompleteWindow->pParent->GetEditView()->GetWindow()->GrabFocus();
-return 0;
-}
-else
-{
-switch( aChar )
-{
-case KEY_ESCAPE: // hide, do nothing
-pCodeCompleteWindow->ClearAndHide();
-return 0;
-case KEY_TAB: case KEY_SPACE:
-/* space, tab the user probably have typed in the whole
- * procedure name: hide the window, and insert the tab/space
- */
-pCodeCompleteWindow->pParent->GetEditView()->InsertText(
OUString(aKeyEvt.GetCharCode()) );
-pCodeCompleteWindow->Hide();
-pCodeCompleteWindow->pParent->GetEditView()->SetSelection(
pCodeCompleteWindow->pParent->GetEditView()->CursorEndOfLine(pCodeCompleteWindow->GetTextSelection().GetStart())
);
-pCodeCompleteWindow->pParent->GrabFocus();
-return 0;
-case KEY_BACKSPACE: case KEY_DELETE:
-if( aFuncBuffer.toString() != OUString("") )
-{
-TextPaM
aEnd(pCodeCompleteWindow->aTextSelection.GetEnd().GetPara(),
pCodeCompleteWindow->GetTextSelection().GetEnd().GetIndex() +
aFuncBuffer.getLength());
-TextPaM
aStart(pCodeCompleteWindow->aTextSelection.GetEnd().GetPara(),
pCodeCompleteWindow->GetTextSelection().GetEnd().GetIndex() +
aFuncBuffer.getLength()-1);
-
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit d146b3cb76887a5f31970124762c045379592499 Author: Tor Lillqvist Date: Fri Aug 2 18:42:24 2013 +0300 Clarify comment Change-Id: If850bc359383c089b5a4f3bd49e46499b761bbe4 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index ba90725..7080b57 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1926,7 +1926,11 @@ sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext > // #i105753# the following if was invented for performance // unfortunately this broke the Mac behavior which is to always run // in quickstart mode since Mac applications do not usually quit -// when the last document closes +// when the last document closes. +// Note that this claim that on OS X we "always run in quickstart mode" +// has nothing to do with (quick) *starting* (i.e. starting automatically +// when the user logs in), though, but with not quitting when no documents +// are open. #ifndef MACOSX if ( bQuickstart ) #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cmis' - include/ucbhelper offapi/com sfx2/source ucbhelper/source ucb/source
include/ucbhelper/content.hxx |4
offapi/com/sun/star/ucb/GlobalTransferCommandArgument2.idl |6 -
offapi/com/sun/star/ucb/InsertCommandArgument2.idl |5
sfx2/source/doc/docfile.cxx|5
ucb/source/core/ucbcmds.cxx|4
ucb/source/ucp/cmis/cmis_content.cxx | 78 ++---
ucbhelper/source/client/content.cxx|6 -
7 files changed, 85 insertions(+), 23 deletions(-)
New commits:
commit 0ffd4c9bce1824054f71d20456fb01b86113e89b
Author: Cao Cuong Ngo
Date: Fri Aug 2 15:04:40 2013 +0200
CMIS: add document ID when saving.
The document ID is needed in case the get object by path
of the CMIS document doesn't work (like Google Drive)
Change-Id: I151d5433a19caeaf4a542b69cd9e95dde58722e7
diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx
index 0c5a2b4..b096802 100644
--- a/include/ucbhelper/content.hxx
+++ b/include/ucbhelper/content.hxx
@@ -670,6 +670,7 @@ public:
* @param rCommentVersion contains the comment to use for checkin
operations
* @param rResultURL is a hacky way to get the update URL after the
operation in
*case there was a change (introduced for the checkin operation)
+ * @param rDocumentId is the document Id ( in case of CMIS ).
*/
sal_Bool
transferContent( const Content& rSourceContent,
@@ -679,7 +680,8 @@ public:
const OUString & rMimeType = OUString( ),
bool bMajorVersion = false,
const OUString & rCommentVersion = OUString( ),
- OUString* pResultURL = NULL )
+ OUString* pResultURL = NULL,
+ const OUString & rDocumentId = OUString( ) )
throw( ::com::sun::star::ucb::CommandAbortedException,
::com::sun::star::uno::RuntimeException,
::com::sun::star::uno::Exception );
diff --git a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument2.idl
b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument2.idl
index 7169ba9..d7ba69b 100644
--- a/offapi/com/sun/star/ucb/GlobalTransferCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/GlobalTransferCommandArgument2.idl
@@ -15,13 +15,17 @@
module com { module sun { module star { module ucb {
/** This struct extends the one for transfers arguments by adding a Mime
-type property to it.
+type and a Document Id property to it.
*/
struct GlobalTransferCommandArgument2 : GlobalTransferCommandArgument
{
/** contains the MIME type of the source object.
*/
string MimeType;
+
+ /** contains the DocumentId of the source object.
+ */
+string DocumentId;
};
diff --git a/offapi/com/sun/star/ucb/InsertCommandArgument2.idl
b/offapi/com/sun/star/ucb/InsertCommandArgument2.idl
index 5105543..c3d1ab8 100644
--- a/offapi/com/sun/star/ucb/InsertCommandArgument2.idl
+++ b/offapi/com/sun/star/ucb/InsertCommandArgument2.idl
@@ -21,6 +21,11 @@ struct InsertCommandArgument2 : InsertCommandArgument
/** contains the MIME type of the document to insert
*/
string MimeType;
+
+ /** contains the Document Id of the document to insert
+ */
+string DocumentId;
+
};
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 746ba20..c59675f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1977,6 +1977,9 @@ void SfxMedium::Transfer_Impl()
OUString aFileName;
Any aAny = aDestContent.getPropertyValue( OUString("Title" ) );
aAny >>= aFileName;
+aAny = aDestContent.getPropertyValue( OUString("ObjectId" ) );
+OUString sObjectId;
+aAny >>= sObjectId;
if ( aFileName.isEmpty() )
aFileName = GetURLObject().getName(
INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
@@ -2041,7 +2044,7 @@ void SfxMedium::Transfer_Impl()
}
OUString sResultURL;
if (!aTransferContent.transferContent( aSourceContent,
eOperation,
-aFileName, nNameClash, aMimeType, bMajor,
sComment, &sResultURL ))
+aFileName, nNameClash, aMimeType, bMajor,
sComment, &sResultURL, sObjectId))
pImp->m_eError = ERRCODE_IO_GENERAL;
else if ( !sResultURL.isEmpty( ) ) // Likely to happen
only for checkin
SwitchDocumentToFile( sResultURL );
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 3c4fdd7..78bf612 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1364,6 +1364,7 @@ void globalTransfer_(
ucb::InsertCommandArgument2 aArg;
aArg.Data = xInputStream;
aArg.MimeType = rContext.aArg.MimeTy
[Libreoffice-commits] core.git: configure.ac
configure.ac | 68 ++- 1 file changed, 35 insertions(+), 33 deletions(-) New commits: commit 64ddbd26a58fd84b56b270c21411ce7c246081ef Author: Tor Lillqvist Date: Fri Aug 2 18:13:12 2013 +0300 Enforce no Java if sandboxed Change-Id: I3c58684cc3914d8f7554c87d8d9e0735e95ea381 diff --git a/configure.ac b/configure.ac index fff3f07..bc6ddb5 100644 --- a/configure.ac +++ b/configure.ac @@ -1136,8 +1136,8 @@ AC_ARG_ENABLE(macosx-code-signing, AC_ARG_ENABLE(macosx-sandbox, AS_HELP_STRING([--enable-macosx-sandbox], [Make the app bundle run in a sandbox. Requires code signing. - The default is to not do this. Experimental work in progress, - don't use unless you are working on this.]), + Is required by apps distributed in the Mac App Store, and implies + adherence to App Store rules.]), ,) AC_ARG_WITH(macosx-bundle-identifier, @@ -2431,6 +2431,37 @@ fi AC_SUBST(ENABLE_LTO) dnl === +dnl Java support enable +dnl === +AC_MSG_CHECKING([whether to build with Java support]) +if test "$with_java" != "no"; then +if test "$DISABLE_SCRIPTING" = TRUE; then +AC_MSG_RESULT([no, overridden by --disable-scripting]) +SOLAR_JAVA="" +with_java=no +else +AC_MSG_RESULT([yes]) +SOLAR_JAVA="TRUE" +fi +else +AC_MSG_RESULT([no]) +SOLAR_JAVA="" +fi + +AC_SUBST(SOLAR_JAVA) + +dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we +dnl want there to be *run-time* (and build-time) support for Java extensions in the +dnl built LibreOffice. + +dnl SOLAR_JAVA="BUILD" is claimed to indicate build-time only support +dnl (no runtime support). It doesn't seem to ever be set to this +dnl value, though, and everywhere SOLAR_JAVA is only checked for being +dnl empty or non-empty. + +dnl SOLAR_JAVA="" indicate no java support at all + +dnl === dnl Test the Solaris compiler version dnl === if test "$_os" = "SunOS"; then @@ -2731,6 +2762,8 @@ if test $_os = Darwin; then if test -z "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then AC_MSG_ERROR([OS X sandboxing requires code signing]) +elif test -n "$SOLAR_JAVA" -a "$enable_macosx_sandbox" = yes; then +AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java]) elif test -n "$MACOSX_CODESIGNING_IDENTITY" -a "$enable_macosx_sandbox" = yes; then ENABLE_MACOSX_SANDBOX=YES AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX) @@ -6242,37 +6275,6 @@ else fi AC_SUBST(BUILD_VER_STRING) -dnl === -dnl Java support enable -dnl === -AC_MSG_CHECKING([whether to build with Java support]) -if test "$with_java" != "no"; then -if test "$DISABLE_SCRIPTING" = TRUE; then -AC_MSG_RESULT([no, overridden by --disable-scripting]) -SOLAR_JAVA="" -with_java=no -else -AC_MSG_RESULT([yes]) -SOLAR_JAVA="TRUE" -fi -else -AC_MSG_RESULT([no]) -SOLAR_JAVA="" -fi - -AC_SUBST(SOLAR_JAVA) - -dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we -dnl want there to be *run-time* (and build-time) support for Java extensions in the -dnl built LibreOffice. - -dnl SOLAR_JAVA="BUILD" is claimed to indicate build-time only support -dnl (no runtime support). It doesn't seem to ever be set to this -dnl value, though, and everywhere SOLAR_JAVA is only checked for being -dnl empty or non-empty. - -dnl SOLAR_JAVA="" indicate no java support at all - JITC_PROCESSOR_TYPE="" if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then # IBMs JDK needs this... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - 2 commits - sw/inc sw/source
sw/inc/format.hxx |1
sw/source/core/doc/swtblfmt.cxx | 111 ++--
2 files changed, 31 insertions(+), 81 deletions(-)
New commits:
commit 5345916a90c80923d7f5a6a621b7461c7ab63f6e
Author: Alex Ivan
Date: Fri Aug 2 18:13:24 2013 +0300
Remove default attribute values from Sw*Fmt
These values, because they were being set in the Sw*Fmts from the
hard format, were "blocking" the attributes from the table style.
All atributes are not yet correctly propagated.
Also, the changes are not instant. There needs to be some other
interaction with the document before they come into effect.
Change-Id: I0c9775c5e988862d67067ac3bc9869851d85945b
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index 62aeace..8c91b77 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -23,14 +23,6 @@ SwTableFmt::SwTableFmt( SwAttrPool& rPool, const sal_Char*
pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
{
-SetBreak( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
-SetKeepWithNextPara( SvxFmtKeepItem( sal_False, RES_KEEP ) );
-SetLayoutSplit( sal_True );
-SetCollapsingBorders( sal_True );
-SetRowSplit( sal_True );
-SetRepeatHeading( 0 );
-SetShadow( SvxShadowItem( RES_SHADOW ) );
-
SwDoc* pDoc = GetDoc();
m_pFstLineFmt.reset( pDoc->MakeTableLineFmt() );
@@ -48,14 +40,6 @@ SwTableFmt::SwTableFmt( SwAttrPool& rPool, const String
&rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
{
-SetBreak( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
-SetKeepWithNextPara( SvxFmtKeepItem( sal_False, RES_KEEP ) );
-SetLayoutSplit( sal_True );
-SetCollapsingBorders( sal_True );
-SetRowSplit( sal_True );
-SetRepeatHeading( 0 );
-SetShadow( SvxShadowItem( RES_SHADOW ) );
-
SwDoc* pDoc = GetDoc();
m_pFstLineFmt.reset( pDoc->MakeTableLineFmt() );
@@ -457,74 +441,12 @@ SwTableLineFmt& SwTableLineFmt::operator=( const
SwTableLineFmt& rNew )
SwTableBoxFmt::SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
-{
-SetFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) );
-SetHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_FONTSIZE) );
-SetWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ) );
-SetPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_POSTURE ) );
-
-SetCJKFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CJK_FONT ) );
-SetCJKHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_CJK_FONTSIZE) );
-SetCJKWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ) );
-SetCJKPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ) );
-
-SetCTLFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CTL_FONT ) );
-SetCTLHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_CTL_FONTSIZE) );
-SetCTLWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ) );
-SetCTLPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ) );
-
-SetUnderline( SvxUnderlineItem( UNDERLINE_NONE, RES_CHRATR_UNDERLINE )
);
-SetOverline( SvxOverlineItem( UNDERLINE_NONE, RES_CHRATR_OVERLINE ) );
-SetCrossedOut( SvxCrossedOutItem( STRIKEOUT_NONE,
RES_CHRATR_CROSSEDOUT ) );
-SetContour( SvxContourItem( sal_False, RES_CHRATR_CONTOUR ) );
-SetShadowed( SvxShadowedItem( sal_False, RES_CHRATR_SHADOWED ) );
-SetColor( SvxColorItem( RES_CHRATR_COLOR ) );
-SvxBoxItem rNew = SvxBoxItem( RES_BOX );
-rNew.SetDistance( 55 );
-SetBox( rNew );
-SetBackground( SvxBrushItem( RES_BACKGROUND ) );
-SetAdjust( SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ) );
-SetTextOrientation( SvxFrameDirectionItem( FRMDIR_ENVIRONMENT,
RES_FRAMEDIR ) );
-SetVerticalAlignment( SwFmtVertOrient( 0,
com::sun::star::text::VertOrientation::NONE,
com::sun::star::text::RelOrientation::FRAME ) );
-
-eSysLanguage = eNumFmtLanguage = ::GetAppLanguage();
-}
+{}
SwTableBoxFmt::SwTableBoxFmt( SwAttrPool& rPool, const String &rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
-{
-SetFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) );
-SetHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_FONTSIZE) );
-SetWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ) );
-SetPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_POSTURE ) );
-
-SetCJKFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CJK_FONT ) );
-Set
[Libreoffice-commits] core.git: configure.ac
configure.ac | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit a642c18fa21c11fb8f9d0b4accb433d806d633d7
Author: Tor Lillqvist
Date: Fri Aug 2 17:41:53 2013 +0300
Indentation cleanup
Change-Id: I20bb0b33f3a86dd9abab32d18f703bf720f143b5
diff --git a/configure.ac b/configure.ac
index af83832..fff3f07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7337,14 +7337,14 @@ if test "$with_system_jpeg" = "yes"; then
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
[AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
AC_MSG_CHECKING([[libjpeg supports JERR_BAD_CROP_SPEC (jpeg-7 API)]])
- AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
- [[
+AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
+ [[
#include
#include
int main(int c, char**v) { printf("%d\n", JERR_BAD_CROP_SPEC); return 0; }
- ]]) ],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)
+ ]]) ],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
AC_MSG_ERROR(jpeg library version >= 7 or
jpeg-turbo version >= 1.1 required)
])
libo_MINGW_CHECK_DLL([libjpeg])
@@ -8207,7 +8207,7 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
dnl dnl HP-UX atomic routines are in atomic library, not standard C
library.
dnl dnl If we can't find atomic routines in vendor library, look for
atomic_ops.
dnl AC_SEARCH_LIBS(atomic_inc, atomic,,
-dnlAC_CHECK_LIB(atomic_ops, main))
+dnl AC_CHECK_LIB(atomic_ops, main))
dnl dnl check for tommath presence
dnl save_LIBS=$LIBS
@@ -9750,12 +9750,12 @@ if test "$test_gtk" = "yes"; then
AC_MSG_CHECKING([whether to enable the systray quickstarter])
if test "x$enable_systray" = "xyes"; then
-AC_MSG_RESULT([yes])
+AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GTK210, gtk+-2.0 >= 2.10.0,
[ ENABLE_SYSTRAY_GTK="TRUE" ],
[ ENABLE_SYSTRAY_GTK="" ])
else
-AC_MSG_RESULT([no])
+AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([whether to enable Gtk print dialog support])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/Library_getuid.mk solenv/bin
setup_native/Library_getuid.mk |8
solenv/bin/modules/installer/download.pm |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit dcb386d787e5d3dbcd67a029569dd9b1cfba9274
Author: Petr Mladek
Date: Fri Aug 2 16:24:23 2013 +0200
let's own the packaged stuff by root:root again (fdo#67388)
We have started to use -fvisibility=hidden globally with GCC.
The hacky libgetuid.so does not work if the symbols are hidden.
In addition, the library was renamed from getuid.so to libgetuid.so
during gbuildisation; There was more location where it was not fixed;
The result was that the packages and files in the Linux download tarballs
were owned by some "ugly" user and group.
Change-Id: I22f62b861c373f2553d85a84dddabaf1f418
diff --git a/setup_native/Library_getuid.mk b/setup_native/Library_getuid.mk
index 764128d..fa98773 100644
--- a/setup_native/Library_getuid.mk
+++ b/setup_native/Library_getuid.mk
@@ -14,6 +14,14 @@ $(eval $(call gb_Library_add_defs,getuid,\
-D_GNU_SOURCE \
))
endif
+
+# the library is used by LD_PRELOAD; make sure that we see the symbols ;-)
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cflags,getuid,\
+-fvisibility=default \
+))
+endif
+
$(eval $(call gb_Library_add_cobjects,getuid,\
setup_native/scripts/source/getuid \
))
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 408dc36..6f83943 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -194,7 +194,7 @@ sub get_path_for_library
{
my ($includepatharrayref) = @_;
-my $getuidlibraryname = "getuid.so";
+my $getuidlibraryname = "libgetuid.so";
my $getuidlibraryref = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/core/inc/frmtool.hxx |2
sw/source/core/inc/swfont.hxx | 35 +
sw/source/core/layout/paintfrm.cxx | 46 ++---
sw/source/core/text/inftxt.cxx | 30 +++
sw/source/core/text/itratr.cxx | 72 +++
sw/source/core/text/itratr.hxx | 21 ++--
sw/source/core/text/itrcrsr.cxx| 52 ++--
sw/source/core/text/porlay.cxx |9 +++
sw/source/core/text/txtdrop.cxx| 19 ++-
sw/source/core/txtnode/swfont.cxx | 96 +++--
10 files changed, 327 insertions(+), 55 deletions(-)
New commits:
commit 051b59ca35b30ec44226c7e5d429c46c00076ad5
Author: Zolnai Tamás
Date: Thu Aug 1 20:17:41 2013 +0200
CharBrd 4.3: drop caps
-Increase the height with the borders width.
(drop portion calculates the height by own, but width is right)
-Avoid caching when there is a border, because caching work
with height and it can happen that border change, but height not.
-Avoid drop portion height when calculate the line height
(except when there is only one line)
-Drop portion has an own font, so we have to use this
font when change the cursor position.
-When painting text, use the current drop portion
part width.
Change-Id: I3d8f4ef9e6f067e28827453f9b6412184943b72e
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 532ee1e..a57a20f 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -379,6 +379,8 @@ public:
const boost::optional& GetAbsBottomBorder( const
bool bVertLayout ) const;
const boost::optional& GetAbsRightBorder( const
bool bVertLayout ) const;
const boost::optional& GetAbsLeftBorder( const
bool bVertLayout ) const;
+
+bool HasBorder() const;
};
inline void SwFont::SetColor( const Color& rColor )
@@ -828,6 +830,11 @@ inline void SwSubFont::SetVertical( const sal_uInt16 nDir,
const sal_Bool bVertF
Font::SetOrientation( nDir );
}
+inline bool SwFont::HasBorder() const
+{
+return m_aTopBorder || m_aBottomBorder || m_aLeftBorder || m_aRightBorder;
+}
+
/*
* class SwUnderlineFont
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 17b7681..3e97fa7 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include // SwPageDesc
#include
@@ -925,9 +926,28 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const
xub_StrLen nOfst,
// Shift the cursor with the right border width
// Note: nX remains positive because GetTxtSize() also
include the width of the right border
-if( GetInfo().GetFont()->GetRightBorder() &&
aInf.GetIdx() < nOfst && nOfst < aInf.GetIdx() + pPor->GetLen() )
+if( aInf.GetIdx() < nOfst && nOfst < aInf.GetIdx() +
pPor->GetLen() )
+{
+// Find the current drop portion part and use its
right border
+if( pPor->IsDropPortion() )
+{
+SwDropPortion* pDrop =
static_cast(pPor);
+const SwDropPortionPart* pCurrPart =
pDrop->GetPart();
+sal_Int16 nSumLength = 0;
+while( pCurrPart && (nSumLength +=
pCurrPart->GetLen()) < nOfst - aInf.GetIdx() )
+{
+pCurrPart = pCurrPart->GetFollow();
+}
+if( pCurrPart && nSumLength != nOfst -
aInf.GetIdx() && pCurrPart->GetFont().GetRightBorder() )
+{
+nX -=
pCurrPart->GetFont().GetRightBorder().get().GetScaledWidth();
+}
+}
+else if(GetInfo().GetFont()->GetRightBorder())
+{
nX -=
GetInfo().GetFont()->GetRightBorder().get().GetScaledWidth();
-
+}
+ }
}
bWidth = sal_False;
break;
@@ -1088,7 +1108,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const
xub_StrLen nOfst,
if ( pCMS->pSpecialPos )
{
// apply attributes to font
-Seek( nOfst );
+SeekAndChgAttrIter( nOfst, aInf.GetOut() );
lcl_GetCharRectInsideField( aInf, *pOrig, *pCMS, *pPor );
}
}
@@ -1617,10 +1637,34 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosi
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 -- 1 file changed, 2 deletions(-) New commits: commit d5fd6bd3571a519784c98055b75807554ed0f47f Author: Tor Lillqvist Date: Fri Aug 2 17:22:19 2013 +0300 test_unix_quickstarter is unused Change-Id: Ie11b97f52832f8f04f8243f4d6c0f18b3954253f diff --git a/configure.ac b/configure.ac index f348f13..af83832 100644 --- a/configure.ac +++ b/configure.ac @@ -411,7 +411,6 @@ linux-gnu*|k*bsd*-gnu*) test_kde=yes test_kde4=yes test_freetype=yes -test_unix_quickstarter=yes _os=Linux ;; @@ -585,7 +584,6 @@ linux-android*) test_kde4=no test_randr=no test_xrender=no -test_unix_quickstarter=no _os=Android if test -z "$with_android_ndk"; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cui/source dbaccess/source
cui/source/inc/optdict.hxx |2 --
dbaccess/source/ui/dlg/generalpage.cxx |4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit e22e166a5defab50c8d4c0b877f3955d4c1a76ae
Author: Tor Lillqvist
Date: Fri Aug 2 16:55:28 2013 +0300
WaE: unknown log area 'dbaui.OGeneralPage' [loplugin]
Change-Id: I669bd637a8f4c9880eaceed2c67b9ddedd6eff3e
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index bad5b78..f0562ec3 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -437,7 +437,7 @@ namespace dbaui
sal_uInt16 nSelected = _pBox->GetSelectEntryPos();
if (nSelected >= m_aEmbeddedURLPrefixes.size() )
{
-SAL_WARN("dbaui.OGeneralPage", "Got out-of-range value '" <<
nSelected << "' from the DatasourceType selection ListBox's
GetSelectEntryPos(): no corresponding URL prefix");
+SAL_WARN("dbaccess.ui.OGeneralPage", "Got out-of-range value '" <<
nSelected << "' from the DatasourceType selection ListBox's
GetSelectEntryPos(): no corresponding URL prefix");
return 0L;
}
const OUString sURLPrefix = m_aEmbeddedURLPrefixes[ nSelected ];
commit c590bf1050893be8dd1488f6beb24a674672b8fb
Author: Tor Lillqvist
Date: Fri Aug 2 16:52:39 2013 +0300
WaE: unknown log area 'dbaaccess' [loplugin]
Change-Id: I327192e60ed75f2c24331f38f89bcfeb085725ba
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index ad09e8d..bad5b78 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -78,7 +78,7 @@ namespace dbaui
DbuTypeCollectionItem* pCollectionItem =
PTR_CAST(DbuTypeCollectionItem, _rItems.GetItem(DSID_TYPECOLLECTION));
if (pCollectionItem)
m_pCollection = pCollectionItem->getCollection();
-SAL_WARN_IF(!m_pCollection, "dbaaccess", "OGeneralPage::OGeneralPage :
really need a DSN type collection !");
+SAL_WARN_IF(!m_pCollection, "dbaccess", "OGeneralPage::OGeneralPage :
really need a DSN type collection !");
// do some knittings
m_pDatasourceType->SetSelectHdl(LINK(this, OGeneralPage,
OnDatasourceTypeSelected));
commit c2dcbd8a83e3ea2945349518602ec0ce605fb95a
Author: Tor Lillqvist
Date: Fri Aug 2 16:48:46 2013 +0300
WaE: private fields 'pHelpBtn' and 'pCloseBtn' are not used
Change-Id: I58db64a58eadb07f06acddc21b9a1d4a424b1ea4
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 05d91c1..51682ee 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -111,8 +111,6 @@ private:
PushButton* pNewReplacePB;
PushButton* pDeletePB;
-HelpButton* pHelpBtn;
-CancelButton*pCloseBtn;
String sModify;
String sNew;
DecorationView aDecoView;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/salinit.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 11bd7758e3bbfcee28343f0f4c233fa3dc4180fb
Author: Tor Lillqvist
Date: Fri Aug 2 16:41:07 2013 +0300
No self-execing when HAVE_FEATURE_MACOSX_SANDBOX so no need to close fds
Change-Id: Iea03aa4708427772952add0f2fc40012b22e572b
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 10553b6..d612dbd 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include "sal/config.h"
#if defined MACOSX
@@ -43,19 +45,19 @@ extern "C" {
void sal_initGlobalTimer();
void sal_detail_initialize(int argc, char ** argv) {
-#if defined MACOSX
-// On Mac OS X, soffice can restart itself via exec (see restartOnMac in
-// desktop/source/app/app.cxx), which leaves all file descriptors open,
-// which in turn can have unwanted effects (see
+#if defined MACOSX && !HAVE_FEATURE_MACOSX_SANDBOX
+// On OS X when not sandboxed, soffice can restart itself via exec (see
+// restartOnMac in desktop/source/app/app.cxx), which leaves all file
+// descriptors open, which in turn can have unwanted effects (see
// "Unable to update
-// LibreOffice without resetting user profile"). But closing fds in
+// LibreOffice without resetting user profile"). But closing fds in
// restartOnMac before calling exec does not work, as additional threads
// might still be running then, which can still use those fds and cause
-// crashes. Therefore, the simples solution is to close fds at process
+// crashes. Therefore, the simplest solution is to close fds at process
// start (as early as possible, so that no other threads have been created
// yet that might already have opened some fds); this is done for all kinds
// of processes here, not just soffice, but hopefully none of our processes
-// rely on being spawned with certain fds already open. Unfortunately, Mac
+// rely on being spawned with certain fds already open. Unfortunately, Mac
// OS X appears to have no better interface to close all fds (like
// closefrom):
long openMax = sysconf(_SC_OPEN_MAX);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - connectivity/source
connectivity/source/drivers/firebird/Connection.cxx | 30 +-
connectivity/source/drivers/firebird/Connection.hxx |1
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 199 --
3 files changed, 135 insertions(+), 95 deletions(-)
New commits:
commit cc1e1e9509dd78d043c4b2f345df84635bc7492a
Author: Andrzej J.R. Hunt
Date: Fri Aug 2 14:41:36 2013 +0200
Only write db to file if we are embedded. (firebird-sdbc)
Change-Id: If6126a8005d666c0c1355efc2a887519da37c891
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index 02beb6b..07b16eb 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -610,6 +610,11 @@ void SAL_CALL OConnection::clearWarnings( )
throw(SQLException, RuntimeExceptio
void SAL_CALL OConnection::documentEventOccured( const DocumentEvent& _Event )
throw(RuntimeException)
{
+MutexGuard aGuard(m_aMutex);
+
+if (!m_bIsEmbedded)
+return;
+
if (_Event.EventName == "OnSave" || _Event.EventName == "OnSaveAs")
{
commit(); // Commit and close transaction
commit 03528afc5c21350b064d6a43fc57f1adc1c94c41
Author: Andrzej J.R. Hunt
Date: Fri Aug 2 14:33:17 2013 +0200
Clear Statements as appropriate. (firebird-sdbc)
Change-Id: Ied90fe623dff284179c88ae77392d641ba0b004b
diff --git a/connectivity/source/drivers/firebird/Connection.cxx
b/connectivity/source/drivers/firebird/Connection.cxx
index 96ed57c..02beb6b 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -421,6 +421,7 @@ void OConnection::setupTransaction()
// is lost...
if (m_transactionHandle)
{
+clearStatements();
isc_rollback_transaction(status_vector, &m_transactionHandle);
}
@@ -454,9 +455,6 @@ void OConnection::setupTransaction()
isc_start_transaction(status_vector, &m_transactionHandle, 1, &m_DBHandler,
(unsigned short) sizeof(isc_tpb), isc_tpb);
-
-//TODO: transmit to open statements?
-
}
isc_tr_handle& OConnection::getTransaction()
@@ -478,6 +476,7 @@ void SAL_CALL OConnection::commit() throw(SQLException,
RuntimeException)
if (!m_bAutoCommit && m_transactionHandle)
{
+clearStatements();
isc_commit_transaction(status_vector, &m_transactionHandle);
}
}
@@ -613,6 +612,7 @@ void SAL_CALL OConnection::documentEventOccured( const
DocumentEvent& _Event )
{
if (_Event.EventName == "OnSave" || _Event.EventName == "OnSaveAs")
{
+commit(); // Commit and close transaction
if ( m_bIsEmbedded && m_xEmbeddedStorage.is() )
{
SAL_INFO("connectivity.firebird", "Writing .fdb into .odb" );
@@ -698,13 +698,7 @@ void OConnection::disposing()
MutexGuard aGuard(m_aMutex);
-for (OWeakRefArray::iterator i = m_aStatements.begin();
m_aStatements.end() != i; ++i)
-{
-Reference< XComponent > xComp(i->get(), UNO_QUERY);
-if (xComp.is())
-xComp->dispose();
-}
-m_aStatements.clear();
+clearStatements();
m_bClosed = sal_True;
m_xMetaData = ::com::sun::star::uno::WeakReference<
::com::sun::star::sdbc::XDatabaseMetaData>();
@@ -734,4 +728,15 @@ void OConnection::disposing()
cppu::WeakComponentImplHelperBase::disposing();
}
+void OConnection::clearStatements()
+{
+MutexGuard aGuard(m_aMutex);
+for (OWeakRefArray::iterator i = m_aStatements.begin();
m_aStatements.end() != i; ++i)
+{
+Reference< XComponent > xComp(i->get(), UNO_QUERY);
+if (xComp.is())
+xComp->dispose();
+}
+m_aStatements.clear();
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Connection.hxx
b/connectivity/source/drivers/firebird/Connection.hxx
index 559bba9..fcc59ef 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -112,6 +112,7 @@ namespace connectivity
voidbuildTypeInfo() throw(
::com::sun::star::sdbc::SQLException);
voidsetupTransaction();
+voidclearStatements();
public:
virtual void construct( const ::rtl::OUString& url,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& info)
commit 935eab83a92426d9fd9e335d8f16c7c4658491c1
Author: Andrzej J.R. Hunt
Date: Fri Aug 2 14:29:16 2013 +0200
Make getPrimaryKeys actually work. (firebird-sdbc)
Change-Id: Ia300e85675a24a2900cfeb8ee75bf58356b14b30
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/Data
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/tabledesign/TableController.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c5fb2644c92c8012b66cf2d1a12d6ce666beed25
Author: Andrzej J.R. Hunt
Date: Fri Aug 2 10:24:57 2013 +0200
Check that xKeys exists before using.
Currently base segfaults here when using a database driver that doesn't
support sdbcx, the internal sdbcx wrapper doesn't implement getKeys()
either.
Change-Id: I195dfa891b4e38e6e0f5a9286bcbfa66ca818e28
Reviewed-on: https://gerrit.libreoffice.org/5243
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index f17ff9b..f75b3e8 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -774,6 +774,8 @@ void
OTableController::appendPrimaryKey(Reference& _rxSup,sal_Boo
OSL_ENSURE(_rxSup.is(),"No XKeysSupplier!");
Reference xKeys(_rxSup->getKeys(),UNO_QUERY);
Reference xProp;
+if (!xKeys.is())
+return;
const sal_Int32 nCount = xKeys->getCount();
for(sal_Int32 i=0;i< nCount ;++i)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/namedlg/namemgrtable.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d1c3f6537419169608a5802c1adf7a2840d6ed19
Author: Thorsten Behrens
Date: Fri Aug 2 15:37:22 2013 +0200
Fix build.
Change-Id: Ic1a6ce26e84982a617d9814645a7bfc3ccd3a63f
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index 304f53b..b0e308a 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -75,7 +75,7 @@ void ScRangeManagerTable::Resize()
void ScRangeManagerTable::StateChanged( StateChangedType nStateChange )
{
-SvSimpleTable::StateChanged(nStateChange);
+SvxSimpleTable::StateChanged(nStateChange);
if (nStateChange == STATE_CHANGE_INITSHOW)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig
dbaccess/source/ui/dlg/dbwizsetup.cxx | 22
dbaccess/source/ui/dlg/generalpage.cxx| 148 +-
dbaccess/source/ui/dlg/generalpage.hxx| 10 ++
dbaccess/source/ui/inc/dbwizsetup.hxx |2
dbaccess/uiconfig/ui/generalpagewizard.ui | 59 ++-
5 files changed, 209 insertions(+), 32 deletions(-)
New commits:
commit 04d1e80ac7091ec2bf31c8617e832d5fe15350be
Author: Andrzej J.R. Hunt
Date: Tue Jul 30 12:27:10 2013 +0200
Add embedded database selector to db setup dialog.
This allows for choosing between the HSQLDB driver (currently default)
and the firebird driver for embedded databases.
Change-Id: I3734440fedf9f07b28f9cfd806dafbe6610393f7
Reviewed-on: https://gerrit.libreoffice.org/5199
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index e14fedf..86b2c99 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -337,7 +337,7 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
{
case OGeneralPageWizard::eCreateNew:
{
-sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf(
m_pCollection->getEmbeddedDatabase() );
+sal_Int32 nCreateNewDBIndex = m_pCollection->getIndexOf(
m_pGeneralPage->GetSelectedType() );
if ( nCreateNewDBIndex == -1 )
nCreateNewDBIndex = m_pCollection->getIndexOf(
OUString("sdbc:dbase:") );
OSL_ENSURE( nCreateNewDBIndex != -1,
"ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have
prevented this!" );
@@ -802,28 +802,10 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
}
//-
-OUString ODbTypeWizDialogSetup::getDefaultDatabaseType() const
-{
-OUString sEmbeddedURL = m_pCollection->getEmbeddedDatabase();
-::connectivity::DriversConfig aDriverConfig(getORB());
-try
-{
-if ( aDriverConfig.getDriverFactoryName(sEmbeddedURL).isEmpty() ||
!m_pImpl->getDriver(sEmbeddedURL).is() )
-sEmbeddedURL = OUString("sdbc:dbase:");
-}
-catch(const Exception&)
-{
-sEmbeddedURL = OUString("sdbc:dbase:");
-}
-
-return sEmbeddedURL;
-}
-
-//-
void ODbTypeWizDialogSetup::CreateDatabase()
{
OUString sUrl;
-OUString eType = getDefaultDatabaseType();
+OUString eType = m_pGeneralPage->GetSelectedType();
if ( m_pCollection->isEmbeddedDatabase(eType) )
{
sUrl = eType;
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 2d2044e..ad09e8d 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -65,20 +65,24 @@ namespace dbaui
,m_eLastMessage ( smNone )
,m_bDisplayingInvalid ( sal_False )
,m_bInitTypeList( true )
+,m_bInitEmbeddedDBList ( true )
,m_pDatasourceType ( NULL )
+,m_pEmbeddedDBType ( NULL )
,m_pCollection ( NULL )
{
get( m_pDatasourceType, "datasourceType" );
+get( m_pEmbeddedDBType, "embeddeddbList" );
get( m_pSpecialMessage, "specialMessage" );
// extract the datasource type collection from the item set
DbuTypeCollectionItem* pCollectionItem =
PTR_CAST(DbuTypeCollectionItem, _rItems.GetItem(DSID_TYPECOLLECTION));
if (pCollectionItem)
m_pCollection = pCollectionItem->getCollection();
-OSL_ENSURE(m_pCollection, "OGeneralPage::OGeneralPage : really need a
DSN type collection !");
+SAL_WARN_IF(!m_pCollection, "dbaaccess", "OGeneralPage::OGeneralPage :
really need a DSN type collection !");
// do some knittings
m_pDatasourceType->SetSelectHdl(LINK(this, OGeneralPage,
OnDatasourceTypeSelected));
+m_pEmbeddedDBType->SetSelectHdl(LINK(this, OGeneralPage,
OnEmbeddedDBTypeSelected));
}
//-
@@ -148,6 +152,46 @@ namespace dbaui
}
//-
+void OGeneralPage::initializeEmbeddedDBList()
+{
+if ( m_bInitEmbeddedDBList )
+{
+m_bInitEmbeddedDBList = false;
+ m_pEmbeddedDBType->Clear();
+
+if ( m_pCollection )
+{
+DisplayedTypes aDisplayedTypes;
+
+::dbaccess::ODsnTypeCollection::TypeIterator aEnd =
m_pCollection->end();
+for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop
= m_pCollection->begin();
+
redlines for pyuno
Hi there, I am doing some scripting for pyuno, and have been studying the internal C++ code for redlines, it seems that the code that is applying redlines to text in the document is not exposed. It would be great to have this accessible for scripting, now I need to figure out what redlines apply to what text and that makes the script quite complex. Is that the only way to currently do it via uno, is there anything planned or any reason not to expose a more comfortable interface? thanks, mike ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67489, which changed state. Bug 67489 Summary: EDITING: copied and pasted cells containing formulas are not recalculated https://bugs.freedesktop.org/show_bug.cgi?id=67489 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/optionen/01010400.xhp | 23 --- 2 files changed, 12 insertions(+), 17 deletions(-) New commits: commit 07886e67f36d3da3e36fc41e612ed0bb7593d6c1 Author: Caolán McNamara Date: Fri Aug 2 15:22:49 2013 +0200 add a toplevel help id for edit dictionary dialog Change-Id: I4c4a53fcabcc233a63b3d1df42527be9967b8b94 diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index 7809b79..90909e2 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -79,6 +79,7 @@ Edit Opens the Edit custom dictionary dialog, in which you can add to your custom dictionary or edit existing entries. + In the Edit custom dictionary dialog you have the option to enter new terms or edit existing entries. If you edit an exception dictionary, the dialog has the added facility of defining an exception for a word. During the spellcheck this exception is then listed as a suggestion. When a dictionary is edited, a check is made on the status of the file. If the file is write-protected, it cannot be changed. The buttons New and Delete are then deactivated. commit 38bf0d781a195bf17a6050b78a1f32968419f41d Author: Csikós Tamás Date: Fri Aug 2 14:19:28 2013 +0200 update help ids for edit dictionary dialog .ui conversion Conflicts: helpers/help_hid.lst Change-Id: Icb6e8a5870b89776583d582d69d296f441ada3bf diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e836ff2..cf94b55 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6892,8 +6892,6 @@ svx_Edit_MD_INSERT_OBJECT_IFRAME_ED_URL,1598212102, svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409, svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, -svx_Edit_RID_SFXDLG_EDITDICT_ED_REPLACE,1270417446, -svx_Edit_RID_SFXDLG_EDITDICT_ED_WORD,1270417444, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, @@ -7042,8 +7040,6 @@ svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105, svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098, svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095, svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323, -svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976, -svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957, svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE,1368854034, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568, @@ -7327,8 +7323,6 @@ svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_SGL_STD,808997425, svx_PushButton_RID_OFAPAGE_AUTOCORR_QUOTE_PB_STARTQUOTE,808997389, svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821, svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743, -svx_PushButton_RID_SFXDLG_EDITDICT_PB_DELETE_REPLACE,1270420008, -svx_PushButton_RID_SFXDLG_EDITDICT_PB_NEW_REPLACE,1270420007, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_DELETE,809226770, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_EDIT,809226766, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_NEW,809226765, diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index 7a3dcbf..7809b79 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -81,25 +81,25 @@ Opens the Edit custom dictionary dialog, in which you can add to your custom dictionary or edit existing entries. In the Edit custom dictionary dialog you have the option to enter new terms or edit existing entries. If you edit an exception dictionary, the dialog has the added facility of defining an exception for a word. During the spellcheck this exception is then listed as a suggestion. When a dictionary is edited, a check is made on the status of the file. If the file is write-protected, it cannot be changed. The buttons New and Delete are then deactivated. - + Book -Specifies the book to be edited. +Specifies the book to be edited. The IgnoreAllList (All) includes all words that have been marked with Ignore during spellcheck. This list is valid only for the current spellcheck. The IgnoreAllList entry cannot be selected and cannot be deleted. Only the words included as content can be deleted. This happens automatically each time that $[officename] is closed. - + Language -Assigns a new language to the current custom dictionary. - +Assigns a new language to the current custom dictionary. + Word -You can type a new word for inclusion in the dictionary. In the list below you will see the contents of the current custom dictionary. If you select a word from this list it is displayed in the text field. If you type a word with a trailing = character, such as "AutoComplete=",
[PUSHED] update help ids for edit dictionary dialog .ui conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5248 -- To view, visit https://gerrit.libreoffice.org/5248 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icb6e8a5870b89776583d582d69d296f441ada3bf Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós Gerrit-Reviewer: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 34eae8ddb00920266c3830013586101d7ce41c05 Author: Caolán McNamara Date: Fri Aug 2 15:22:49 2013 +0200 Updated core Project: help 07886e67f36d3da3e36fc41e612ed0bb7593d6c1 diff --git a/helpcontent2 b/helpcontent2 index 33355fd..07886e6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 33355fd1b7c9eaeda41abeb3e5519b9fb18ab377 +Subproject commit 07886e67f36d3da3e36fc41e612ed0bb7593d6c1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 36
sc/source/core/data/column3.cxx |3 +--
2 files changed, 37 insertions(+), 2 deletions(-)
New commits:
commit be4c731bd680cf531633890b913302dacd5e01b8
Author: Kohei Yoshida
Date: Thu Aug 1 15:36:40 2013 -0400
fdo#67489: Don't stop range search even when the first cell is empty.
Because we aren't supposed to. Think of those formula cells that follow
the empty one.
Change-Id: I2cd04833d5e6c561e9ab6d83a984dbdceefa2e71
Reviewed-on: https://gerrit.libreoffice.org/5233
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 93d8dd5..0bda2a4 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -218,6 +218,7 @@ public:
void testDataArea();
void testAutofilter();
void testCopyPaste();
+void testCopyPasteRelativeFormula();
void testMergedCells();
void testUpdateReference();
@@ -322,6 +323,7 @@ public:
CPPUNIT_TEST(testToggleRefFlag);
CPPUNIT_TEST(testAutofilter);
CPPUNIT_TEST(testCopyPaste);
+CPPUNIT_TEST(testCopyPasteRelativeFormula);
CPPUNIT_TEST(testMergedCells);
CPPUNIT_TEST(testUpdateReference);
CPPUNIT_TEST(testJumpToPrecedentsDependents);
@@ -5964,6 +5966,40 @@ void Test::testCopyPaste()
m_pDoc->DeleteTab(0);
}
+void Test::testCopyPasteRelativeFormula()
+{
+m_pDoc->InsertTab(0, "Formula");
+
+AutoCalcSwitch aACSwitch(m_pDoc, true);
+
+// Insert values to A2 and A4.
+m_pDoc->SetValue(ScAddress(0,1,0), 1);
+m_pDoc->SetValue(ScAddress(0,3,0), 2);
+
+// Insert formula to B4.
+m_pDoc->SetString(ScAddress(1,3,0), "=A4");
+CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc->GetValue(ScAddress(1,3,0)));
+
+// Select and copy B3:B4 to the clipboard.
+ScRange aRange(1,2,0,1,3,0);
+ScClipParam aClipParam(aRange, false);
+ScMarkData aMark;
+aMark.SetMarkArea(aRange);
+ScDocument aClipDoc(SCDOCMODE_CLIP);
+m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark);
+
+// Paste it to B1:B2.
+sal_uInt16 nFlags = IDF_ALL;
+ScRange aDestRange(1,0,0,1,1,0);
+aMark.SetMarkArea(aDestRange);
+m_pDoc->CopyFromClip(aDestRange, aMark, nFlags, NULL, &aClipDoc);
+
+// B2 references A2, so the value should be 1.
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(1,1,0)));
+
+m_pDoc->DeleteTab(0);
+}
+
void Test::testMergedCells()
{
//test merge and unmerge
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 4c688ef..2a24220 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1150,8 +1150,7 @@ void ScColumn::BroadcastInArea( SCROW nRow1, SCROW nRow2 )
SCROW nRow;
SCSIZE nIndex;
-if (!Search(nRow1, nIndex))
-return;
+Search(nRow1, nIndex);
while ( nIndex < maItems.size() && (nRow = maItems[nIndex].nRow) <= nRow2 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk extras/source
cui/UIConfig_cui.mk|1
cui/source/inc/cuires.hrc |1
cui/source/inc/optdict.hxx | 35 +-
cui/source/options/optdict.cxx | 280 +++
cui/source/options/optdict.hrc | 47 ---
cui/source/options/optdict.src | 128 --
cui/uiconfig/ui/editdictionarydialog.ui| 298 +
extras/source/glade/libreoffice-catalog.xml.in |3
8 files changed, 465 insertions(+), 328 deletions(-)
New commits:
commit 3604f3f005c392006378bb90e4ff42fed73a138b
Author: Csikós Tamás
Date: Thu Aug 1 16:53:28 2013 +0200
modern .ui widgetlayout for editdictionarydialog
widget found at writer/tools/options/writing aid
Conflicts:
cui/UIConfig_cui.mk
Change-Id: I1cd4ff5c85f373ccd8d7b808f6ef869fe4c2d312
Reviewed-on: https://gerrit.libreoffice.org/5228
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 1401bb8..99424f8 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/comment \
cui/uiconfig/ui/cuiimapdlg \
+ cui/uiconfig/ui/editdictionarydialog \
cui/uiconfig/ui/formatnumberdialog \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index ec0cf14..c4afb90 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -204,6 +204,7 @@
// dialogs
#define RID_SVX_WND_COMMON_LINGU( RID_SVX_START + 0 )
#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB(RID_SVX_START + 337)
+#define STR_MODIFY (RID_SVX_START + 336)//from
optdict.src
#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22)
// hyperlink dialog
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index cd1a0a8..05d91c1 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -82,6 +82,8 @@ class SvxDictEdit : public Edit
public:
SvxDictEdit(Window* pParent, const ResId& rResId) :
Edit(pParent, rResId), bSpaces(sal_False){}
+SvxDictEdit(Window* pParent, WinBits aWB) :
+Edit(pParent, aWB), bSpaces(sal_False){}
voidSetActionHdl( const Link& rLink )
{ aActionLink = rLink;}
@@ -98,22 +100,19 @@ class SvxEditDictionaryDialog : public ModalDialog
{
private:
-FixedText aBookFT;
-ListBox aAllDictsLB;
-FixedText aLangFT;
-SvxLanguageBox aLangLB;
-
-FixedText aWordFT;
-SvxDictEdit aWordED;
-FixedText aReplaceFT;
-SvxDictEdit aReplaceED;
-SvTabListBoxaWordsLB;
-PushButton aNewReplacePB;
-PushButton aDeletePB;
-FixedLineaEditDictsBox;
-
-HelpButton aHelpBtn;
-CancelButtonaCloseBtn;
+ListBox* pAllDictsLB;
+FixedText* pLangFT;
+SvxLanguageBox* pLangLB;
+
+SvxDictEdit* pWordED;
+FixedText* pReplaceFT;
+SvxDictEdit* pReplaceED;
+SvTabListBox*pWordsLB;
+PushButton* pNewReplacePB;
+PushButton* pDeletePB;
+
+HelpButton* pHelpBtn;
+CancelButton*pCloseBtn;
String sModify;
String sNew;
DecorationView aDecoView;
@@ -148,7 +147,7 @@ private:
protected:
-virtual voidPaint( const Rectangle& rRect );
+//virtual voidPaint( const Rectangle& rRect );
public:
SvxEditDictionaryDialog( Window* pParent,
@@ -157,7 +156,7 @@ public:
::com::sun::star::linguistic2::XSpellChecker1> &xSpl );
~SvxEditDictionaryDialog();
-sal_uInt16 GetSelectedDict() {return aAllDictsLB.GetSelectEntryPos();}
+sal_uInt16 GetSelectedDict() {return pAllDictsLB->GetSelectEntryPos();}
};
#endif
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 020cb17..f30a69d 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -32,7 +32,6 @@
#include
#include
-#include "optdict.hrc"
#include "optdict.hxx"
#include
#include
@@ -194,30 +193,21 @@ IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog,
ModifyHdl_Impl)
//
//==
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window
*pParent, VclBuilder::stringmap&)
+{
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_BORDER|W
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/svids.hrc |2 +-
vcl/source/src/btntext.src |5 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 9e00c7fd5c81e68bab4d6e624576c9ad8c5fa5ae
Author: Caolán McNamara
Date: Fri Aug 2 15:13:12 2013 +0200
don't reuse SV_HELPTEXT_CLOSE for SV_BUTTONTEXT_CLOSE
so we get mnemonics
Change-Id: I45696077734335f7e3cbb5094de24304e887c349
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index f1276fa..d07e853 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -145,7 +145,7 @@
#define SV_BUTTONTEXT_NO10103
#define SV_BUTTONTEXT_RETRY 10104
#define SV_BUTTONTEXT_HELP 10105
-#define SV_BUTTONTEXT_CLOSE SV_HELPTEXT_CLOSE
+#define SV_BUTTONTEXT_CLOSE 10106
#define SV_BUTTONTEXT_MORE 10107
#define SV_BUTTONTEXT_IGNORE10108
#define SV_BUTTONTEXT_ABORT 10109
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index f4c5ae8..8b5fd20 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -66,6 +66,11 @@ String SV_BUTTONTEXT_HELP
Text [ en-US ] = "~Help";
};
+String SV_BUTTONTEXT_CLOSE
+{
+Text [ en-US ] = "~Close";
+};
+
String SV_BUTTONTEXT_MORE
{
Text [ en-US ] = "~More";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: Create Print Dialog
Hi Ahmed, > I want to create a custom print dialog using LO. Do you mean you want to hack the dialog? > Before LO 4.0 there was already a print dialog working well, but since the > update to 4.0 > it is not working anymore as some classes of UNO are deprecated. Or, the dialog doesn't work for you at all? Ahmad, Warning: This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. ?: ??? ??? ??? ? ?? ?? (?? ) ? ?? ? ??? ??? ? ? ???. ??? ?? ??? ? ?? ??? ? ??? ?? ? ??? ? (?? )? ??? ?? ??? ?? ? ??? ??? ?? (?? ) ?? ?? ??? ? ?? ? ?? ? ?? ? ??? ???. ? ??? ??? ??? ? (?? ) ?? ??? ??? ??? ? ? ? ?? ??? ? ??? ? ??? ?? ??? ?? ??? ??? ?? ?? ?? ?? ??? ??. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 945634b1397c0280b0d8ca1614b7bd8e974c8ab8 Author: Caolán McNamara Date: Fri Aug 2 15:05:46 2013 +0200 Updated core Project: help 33355fd1b7c9eaeda41abeb3e5519b9fb18ab377 diff --git a/helpcontent2 b/helpcontent2 index dd74d32..33355fd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit dd74d327294ac10372f0fc38a545b2f629d76632 +Subproject commit 33355fd1b7c9eaeda41abeb3e5519b9fb18ab377 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/01/02220100.xhp | 22 +++--- 2 files changed, 11 insertions(+), 17 deletions(-) New commits: commit 33355fd1b7c9eaeda41abeb3e5519b9fb18ab377 Author: Caolán McNamara Date: Fri Aug 2 15:05:46 2013 +0200 update help ids for image map properties .ui conversion Change-Id: Ice40a8eb996c1abce0dcf60412a6fb06dbcdfb82 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 38a7d60..e836ff2 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6872,7 +6872,6 @@ svx_CheckBox_RID_SVX_SPLITCELLDLG_CB_PROP,1238287371, svx_Checkbox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_SGL_TYPO,808993849, svx_ComboBox_DLG_DOCUMENTLINK_CMB_URL,1346113537, svx_ComboBox_RID_SVXDLG_ADD_INSTANCE_ED_INST_URL,1368952846, -svx_ComboBox_RID_SVXDLG_IMAPURL_CBB_TARGETS,1244991489, svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545, svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360, svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592, @@ -6903,9 +6902,6 @@ svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_ACTION,1368918030, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034, svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965, -svx_Edit_RID_SVXDLG_IMAPURL_EDT_NAME,1244989443, -svx_Edit_RID_SVXDLG_IMAPURL_EDT_URL,1244989442, -svx_Edit_RID_SVXDLG_IMAPURL_EDT_URLDESCRIPTION,1244989441, svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497, svx_Edit_RID_SVXDLG_JAVA_PARAMETER_ED_PARAMETER,1241745419, svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_PREFIX,1368901643, @@ -7264,7 +7260,6 @@ svx_ModalDialog_RID_DLG_NEWLIB,1242333184, svx_ModalDialog_RID_OFADLG_OPTIONS_TREE_HINT,1346011136, svx_ModalDialog_RID_SVXDLG_ASSIGNCOMPONENT,1242447872, svx_ModalDialog_RID_SVXDLG_GALLERY_THEMEID,1243627520, -svx_ModalDialog_RID_SVXDLG_IMAPURL,1244987392, svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224, svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744, svx_ModalDialog_RID_SVX_DLG_INPUTRECORDNO,1368817664, @@ -7277,7 +7272,6 @@ svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448, svx_MultiLineEdit_MD_ICONCHANGE_EDT_ADDR,1080609701, svx_MultiLineEdit_MD_INSERT_OBJECT_APPLET_ED_APPLET_OPTIONS,1598179860, svx_MultiLineEdit_RID_SVXDLG_ADD_CONDITION_ED_CONDITION,1368869387, -svx_MultiLineEdit_RID_SVXDLG_IMAPURL_EDT_DESCRIPTION,1244989956, svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD,2311850530, svx_MultiLineEdit_RID_SVXPAGE_ERR_REP_SEND_ML_ERRSEND_USING,700893719, svx_MultiLineEdit_RID_SVXPAGE_MENUS_ED_DESCRIPTION,705497925, diff --git a/source/text/shared/01/02220100.xhp b/source/text/shared/01/02220100.xhp index 32ff4de..7aa48eb 100644 --- a/source/text/shared/01/02220100.xhp +++ b/source/text/shared/01/02220100.xhp @@ -31,28 +31,28 @@ properties;hotspots ImageMap;hotspot properties MW inserted index entries - + Description - Lists the properties for the selected hotspot. + Lists the properties for the selected hotspot. Hyperlink Lists the properties of the URL that is attached to the hotspot. - + URL: - Enter the URL for the file that you want to open when you click the selected hotspot. If you want to jump to a named anchor within the current document, the address should be of the form "file:///C/[current_document_name]#anchor_name". - + Enter the URL for the file that you want to open when you click the selected hotspot. If you want to jump to a named anchor within the current document, the address should be of the form "file:///C/[current_document_name]#anchor_name". + Alternative text: - Enter the text that you want to display when the mouse rests on the hotspot in a browser. If you do not enter any text, the Address is displayed. - + Enter the text that you want to display when the mouse rests on the hotspot in a browser. If you do not enter any text, the Address is displayed. + Frame: - Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name that is recognized by all browsers from the list. - + Enter the name of the target frame that you want to open the URL in. You can also select a standard frame name that is recognized by all browsers from the list. + Name: - Enter a name for the image. - + Enter a name for the image. + Description Enter a description for the hotspot. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/dialogs/cuiimapwnd.cxx |2 cui/source/inc/cuires.hrc |4 cui/uiconfig/ui/cuiimapdlg.ui | 293 ++ 3 files changed, 179 insertions(+), 120 deletions(-) New commits: commit ef2c08ee6c3221cf8c6207020b610f0475b45f88 Author: Caolán McNamara Date: Fri Aug 2 14:58:38 2013 +0200 tweak spacing and express description height in no of lines Change-Id: I982506adf76485d838dffdee512e96b94bcbdd7b diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 4d16cb8..1c9e971 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -56,6 +56,8 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT get(m_pEdtName, "nameentry"); get(m_pEdtAlternativeText, "textentry"); get(m_pEdtDescription, "descTV"); +m_pEdtDescription->set_height_request(m_pEdtDescription->GetTextHeight() * 5); + m_pEdtDescription->set_width_request(m_pEdtDescription->approximate_char_width() * 60); m_pEdtURL->SetText( rURL ); m_pEdtAlternativeText->SetText( rAlternativeText ); diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 247a49a..ec0cf14 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -237,10 +237,6 @@ #define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) #define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) -// imap dialog -#define RID_SVX_IMAPDLG_START (RID_SVX_START + 100) -#define RID_SVXDLG_IMAPURL (RID_SVX_IMAPDLG_START + 2) - // hangulhanja #define RID_SVX_MDLG_HANGULHANJA(RID_SVX_START + 1 ) #define RID_SVX_MDLG_HANGULHANJA_OPT( RID_SVX_START + 4 ) diff --git a/cui/uiconfig/ui/cuiimapdlg.ui b/cui/uiconfig/ui/cuiimapdlg.ui index fb036a2..1b80361 100644 --- a/cui/uiconfig/ui/cuiimapdlg.ui +++ b/cui/uiconfig/ui/cuiimapdlg.ui @@ -22,7 +22,6 @@ True True True -False True @@ -39,7 +38,6 @@ True True True -False True @@ -56,7 +54,6 @@ True True True -False True @@ -79,16 +76,46 @@ True False +True +True vertical +12 - + True False -True -0 -_URL -True -urlentry +vertical +6 + + +True +False +True +0 +_URL +True +urlentry + + +False +True +0 + + + + +True +True +True +â +True + + +False +True +1 + + False @@ -97,27 +124,46 @@ - -True -True -True -â - - -False -True -1 - - - - + True False -True -0 -F_rame -True -frameCB +vertical +6 + + +True +False +True +0 +F_rame +True +frameCB + + +False +True +0 + + + + +True +False +start +True + + +False +â + + + + +False +False +1 + +
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/dialogs/cuiimapdlg.hrc | 38 -
cui/source/dialogs/cuiimapdlg.src | 147
cui/source/dialogs/cuiimapwnd.cxx | 37 +
cui/source/inc/cuiimapwnd.hxx | 29 +---
cui/uiconfig/ui/cuiimapdlg.ui | 269 ++
7 files changed, 293 insertions(+), 229 deletions(-)
New commits:
commit 1e91ddc06159806620d93385c900cd3d98b14814
Author: Manal Alhassoun
Date: Thu Aug 1 13:56:03 2013 +0300
Convert ImageMap Properties to Widget UI
Change-Id: I619b2dab67b22d75839b9968e7e784b5dd5268ad
Reviewed-on: https://gerrit.libreoffice.org/5226
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 3d1d8de..45818b9 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/customize/macropg.src \
cui/source/dialogs/colorpicker.src \
cui/source/dialogs/commonlingui.src \
-cui/source/dialogs/cuiimapdlg.src \
cui/source/dialogs/cuires.src \
cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index a3f8efd..1401bb8 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/comment \
+ cui/uiconfig/ui/cuiimapdlg \
cui/uiconfig/ui/formatnumberdialog \
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/colorconfigwin \
diff --git a/cui/source/dialogs/cuiimapdlg.hrc
b/cui/source/dialogs/cuiimapdlg.hrc
index 8d2fcf4..e69de29 100644
--- a/cui/source/dialogs/cuiimapdlg.hrc
+++ b/cui/source/dialogs/cuiimapdlg.hrc
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include
-
-// ImapDlg-Dialoge
-
-#define FT_URLDESCRIPTION 1
-#define FT_URL1 2
-#define FT_TARGET 3
-#define FT_NAME 4
-#define FT_DESCRIPTION 5
-#define EDT_URLDESCRIPTION 1
-#define EDT_URL 2
-#define EDT_NAME3
-#define EDT_DESCRIPTION 4
-#define BTN_HELP1 1
-#define BTN_OK1 2
-#define BTN_CANCEL1 3
-#define FL_URL 1
-#define CBB_TARGETS 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/cuiimapdlg.src
b/cui/source/dialogs/cuiimapdlg.src
index 660077e..e69de29 100644
--- a/cui/source/dialogs/cuiimapdlg.src
+++ b/cui/source/dialogs/cuiimapdlg.src
@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.hrc"
-#include "cuiimapdlg.hrc"
-
-ModalDialog RID_SVXDLG_IMAPURL
-{
-HelpID = "cui:ModalDialog:RID_SVXDLG_IMAPURL";
-SVLook = TRUE ;
-OutputSize = TRUE ;
-Closeable = TRUE ;
-Moveable = TRUE ;
-Size = MAP_APPFONT ( 214 , 188 ) ;
-Text [ en-US ] = "Properties" ;
-
-FixedText FT_URL1
-{
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MA
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc3' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/firebird-sdbc' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] update help ids for edit dictionary dialog .ui conversion
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5248 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/48/5248/1 update help ids for edit dictionary dialog .ui conversion Change-Id: Icb6e8a5870b89776583d582d69d296f441ada3bf --- M helpers/help_hid.lst M source/text/shared/optionen/01010400.xhp 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 769184f..1555b66 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6951,8 +6951,6 @@ svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409, svx_Edit_MD_MENU_ORGANISER_EDIT_MENU_NAME,1079953796, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, -svx_Edit_RID_SFXDLG_EDITDICT_ED_REPLACE,1270417446, -svx_Edit_RID_SFXDLG_EDITDICT_ED_WORD,1270417444, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, @@ -7105,8 +7103,6 @@ svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095, svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323, svx_ListBox_RID_OPTPAGE_CHART_DEFCOLORS_LB_CHART_COLOR_LIST,705613314, -svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976, -svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957, svx_ListBox_RID_SVXDLG_ADD_DATAITEM_LB_DATATYPE,1368854034, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_BIND,1368919573, svx_ListBox_RID_SVXDLG_ADD_SUBMISSION_LB_SUBMIT_METHOD,1368919568, @@ -7414,8 +7410,6 @@ svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT,809013821, svx_PushButton_RID_OFAPAGE_SMARTTAG_OPTIONS_PB_SMARTTAGS,809259743, svx_PushButton_RID_OPTPAGE_CHART_DEFCOLORS_PB_RESET_TO_DEFAULT,705614341, -svx_PushButton_RID_SFXDLG_EDITDICT_PB_DELETE_REPLACE,1270420008, -svx_PushButton_RID_SFXDLG_EDITDICT_PB_NEW_REPLACE,1270420007, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_DELETE,809226770, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_EDIT,809226766, svx_PushButton_RID_SFXPAGE_DBREGISTER_BTN_NEW,809226765, diff --git a/source/text/shared/optionen/01010400.xhp b/source/text/shared/optionen/01010400.xhp index 8c93bd5..1b648d5 100644 --- a/source/text/shared/optionen/01010400.xhp +++ b/source/text/shared/optionen/01010400.xhp @@ -80,25 +80,25 @@ Opens the Edit custom dictionary dialog, in which you can add to your custom dictionary or edit existing entries. In the Edit custom dictionary dialog you have the option to enter new terms or edit existing entries. If you edit an exception dictionary, the dialog has the added facility of defining an exception for a word. During the spellcheck this exception is then listed as a suggestion. When a dictionary is edited, a check is made on the status of the file. If the file is write-protected, it cannot be changed. The buttons New and Delete are then deactivated. - + Book -Specifies the book to be edited. +Specifies the book to be edited. The IgnoreAllList (All) includes all words that have been marked with Ignore during spellcheck. This list is valid only for the current spellcheck. The IgnoreAllList entry cannot be selected and cannot be deleted. Only the words included as content can be deleted. This happens automatically each time that $[officename] is closed. - + Language -Assigns a new language to the current custom dictionary. - +Assigns a new language to the current custom dictionary. + Word -You can type a new word for inclusion in the dictionary. In the list below you will see the contents of the current custom dictionary. If you select a word from this list it is displayed in the text field. If you type a word with a trailing = character, such as "AutoComplete=", the word is never automatically hyphenated and no hyphenation is suggested. Typing "Auto=Complete" results in the word being hyphenated, or a hyphenation suggested, where you insert the = sign. - +You can type a new word for inclusion in the dictionary. In the list below you will see the contents of the current custom dictionary. If you select a word from this list it is displayed in the text field. If you type a word with a trailing = character, such as "AutoComplete=", the word is never automatically hyphenated and no hyphenation is suggested. Typing "Auto=Complete" results in the word being hyphenated, or a hyphenation suggested, where you insert the = sign. + Suggestion -This input field is only available if you are editing an exception dictionary. The field shows the alternative suggestion for the current word in the "Word" text box. - +This input field is only available if you are editing an exception dictionary. The field shows the alternative suggestion for the current word in the "Word" text box. + New -Adds the word in the Word text field to your current custom dictionary. The word in the Suggestion field is also added when working with exception dictionaries. - +Adds the word in the Word text fi
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 51620, which changed state. Bug 51620 Summary: Windows: Toolbar look inconsistent, depends on docking place https://bugs.freedesktop.org/show_bug.cgi?id=51620 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - dbaccess/source wizards/com
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 32 +++--
wizards/com/sun/star/wizards/db/SQLQueryComposer.java |3 -
2 files changed, 23 insertions(+), 12 deletions(-)
New commits:
commit 3d5a27bf5a50870adce0bd43f9f71211e9caaac2
Author: Lionel Elie Mamane
Date: Fri Aug 2 12:10:57 2013 +0200
for later...
Change-Id: I266d2992bcd212a6539e4b50c9daf2c53ff98904
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index b1270f0..9143aff 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1591,6 +1591,9 @@ void OSingleSelectQueryComposer::setConditionByColumn(
const Reference< XPropert
const OUString aQuote= m_xMetaData->getIdentifierQuoteString();
getColumns();
+// TODO: if this is called for HAVING, check that the column is a GROUP BY
column
+// or that it is an aggregate function
+
if ( m_aCurrentColumns[SelectColumns] &&
m_aCurrentColumns[SelectColumns]->hasByName(aName) )
{
Reference xColumn;
commit a8f327a9fc13fe5d0992aba4d217b8c909871237
Author: Lionel Elie Mamane
Date: Fri Aug 2 12:10:25 2013 +0200
make comment actually describe the code
Change-Id: If4dda13ff8018d7fd855457a76db2acf8077a477
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index c77c2b6..b1270f0 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1353,7 +1353,8 @@ OUString OSingleSelectQueryComposer::getTableAlias(const
Reference< XPropertySet
{
aComposedName = ::dbtools::composeTableName( m_xMetaData,
aCatalog, aSchema, aTable, sal_False, ::dbtools::eInDataManipulation );
-// first check if this is the table we want to or has it a
tablealias
+// Is this the right case for the table name?
+// Else, look for it with different case, if applicable.
if(!m_pTables->hasByName(aComposedName))
{
commit 0fafb92e97855c4f5e461c6198d92b41431b1227
Author: Lionel Elie Mamane
Date: Fri Aug 2 12:09:53 2013 +0200
janitorial: more const where possible
Change-Id: If579b2b2990c3cdd4785077aa1b34c33bcc241b6
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index cb65b4b..c77c2b6 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1332,8 +1332,8 @@ OUString OSingleSelectQueryComposer::getTableAlias(const
Reference< XPropertySet
column->getPropertyValue(PROPERTY_NAME) >>= aColumnName;
Sequence< OUString> aNames(m_pTables->getElementNames());
-const OUString* pBegin = aNames.getConstArray();
-const OUString* pEnd = pBegin + aNames.getLength();
+const OUString* pBegin = aNames.getConstArray();
+const OUString* const pEnd = pBegin + aNames.getLength();
if(aTable.isEmpty())
{ // we haven't found a table name, now we must search every table for
this column
commit 6fc71eea1d11d0d373ad32052d25f65e800509e7
Author: Lionel Elie Mamane
Date: Fri Aug 2 12:08:16 2013 +0200
SingleSelectQueryComposer: the name of a non-SELECT column is its "real"
name
That is, the name in the table.
Change-Id: I95326915f381ec0cf72c66f13352ce76d82e9517
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 58a5564..cb65b4b 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -541,21 +541,29 @@ OUString
OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< X
throw
SQLException(DBACORE_RESSTRING(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,makeAny(aErr)
);
}
-OUString aName, aNewName;
+OUString aName;
column->getPropertyValue(PROPERTY_NAME) >>= aName;
+const OUString aQuote = m_xMetaData->getIdentifierQuoteString();
+
+if ( m_aCurrentColumns[SelectColumns] &&
+ m_aCurrentColumns[SelectColumns]->hasByName(aName) )
+{
+// It is a column from the SELECT list, use it as such.
+return ::dbtools::quoteName(aQuote,aName);
+}
+
+// Nope, it is an unrelated column.
+// Is that supported?
if ( bOrderBy &&
- !m_xMetaData->supportsOrderByUnrelated() &&
- m_aCurrentColumns[SelectColumns] &&
- !m_aCurrentColumns[SelectColumns]->hasByName(aName) )
+ !m_xMetaData->supportsOrderByUnrelated() )
{
OUString sError(DBACORE_RESSTRING(RID_STR_COLUMN_MUST_VISIBLE));
throw SQLException(sEr
[PUSHED] fdo#67235 adapt form control code to time nanosecond API cha...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5149 Approvals: Lionel Elie Mamane: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5149 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lionel Elie Mamane Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Lionel Elie Mamane Gerrit-Reviewer: Norbert Thiebaud Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#67235 adapt form control code to time nanosecond API cha...
Lionel Elie Mamane has created a new patch set by issuing a rebase in Gerrit (#2). Change subject: fdo#67235 adapt form control code to time nanosecond API change .. fdo#67235 adapt form control code to time nanosecond API change Conflicts: offapi/type_reference/offapi.rdb Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 --- M include/toolkit/awt/vclxwindows.hxx M include/toolkit/controls/unocontrolbase.hxx M include/toolkit/controls/unocontrols.hxx M include/toolkit/helper/property.hxx M offapi/com/sun/star/awt/XTimeField.idl M offapi/type_reference/offapi.rdb M qadevOOo/tests/java/ifc/awt/_XTimeField.java M svx/source/fmcomp/gridcell.cxx M svx/source/form/fmobjfac.cxx M toolkit/source/awt/vclxwindows.cxx M toolkit/source/controls/unocontrolbase.cxx M toolkit/source/controls/unocontrolmodel.cxx M toolkit/source/controls/unocontrols.cxx M toolkit/source/helper/property.cxx M vcl/source/control/field2.cxx M xmloff/source/forms/handler/vcl_time_handler.cxx 16 files changed, 155 insertions(+), 150 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/5149/2 -- To view, visit https://gerrit.libreoffice.org/5149 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lionel Elie Mamane Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Lionel Elie Mamane Gerrit-Reviewer: Norbert Thiebaud Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Calling AddDocumentToPickList in SFX_EVENT_OPENDOC
Hi guys, Is there any reason why AddDocumentToPickList is not called inside the SFX_EVENT_OPENDOC event in: sfx2/source/appl/sfxpicklist.cxx To be consistent with other Windows applications, I would like to add the document to the recent list of documents when you open it. This would be done automatically just calling AddDocumentToPickList inside the event. I see the event uses SvtHistoryOptions().AppendItem instead. Any comment will be highly appreciated. Thanks. -- Jesús Corrius ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/toolkit offapi/com offapi/type_reference qadevOOo/tests svx/source toolkit/source vcl/source xmloff/source
include/toolkit/awt/vclxwindows.hxx | 20 +++--- include/toolkit/controls/unocontrolbase.hxx |3 + include/toolkit/controls/unocontrols.hxx | 20 +++--- include/toolkit/helper/property.hxx |6 +- offapi/com/sun/star/awt/XTimeField.idl | 26 offapi/type_reference/offapi.rdb |binary qadevOOo/tests/java/ifc/awt/_XTimeField.java |4 - svx/source/fmcomp/gridcell.cxx |8 +- svx/source/form/fmobjfac.cxx |2 toolkit/source/awt/vclxwindows.cxx | 42 +++--- toolkit/source/controls/unocontrolbase.cxx | 55 -- toolkit/source/controls/unocontrolmodel.cxx |4 - toolkit/source/controls/unocontrols.cxx | 26 toolkit/source/helper/property.cxx |6 +- vcl/source/control/field2.cxx| 67 --- xmloff/source/forms/handler/vcl_time_handler.cxx |8 +- 16 files changed, 151 insertions(+), 146 deletions(-) New commits: commit ed904af8665f6f7590fedd4ad608018f78c686c1 Author: Lionel Elie Mamane Date: Sun Jul 28 16:08:26 2013 +0200 fdo#67235 adapt form control code to time nanosecond API change Conflicts: offapi/type_reference/offapi.rdb Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Reviewed-on: https://gerrit.libreoffice.org/5149 Reviewed-by: Lionel Elie Mamane Tested-by: Lionel Elie Mamane diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index f822b0c..a3a9f1b 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -1019,16 +1019,16 @@ public: ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTimeField -void SAL_CALL setTime( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); -sal_Int32 SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException); -void SAL_CALL setMin( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); -sal_Int32 SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException); -void SAL_CALL setMax( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); -sal_Int32 SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException); -void SAL_CALL setFirst( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); -sal_Int32 SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException); -void SAL_CALL setLast( sal_Int32 Time ) throw(::com::sun::star::uno::RuntimeException); -sal_Int32 SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException); +void SAL_CALL setTime( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); +sal_Int64 SAL_CALL getTime( ) throw(::com::sun::star::uno::RuntimeException); +void SAL_CALL setMin( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); +sal_Int64 SAL_CALL getMin( ) throw(::com::sun::star::uno::RuntimeException); +void SAL_CALL setMax( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); +sal_Int64 SAL_CALL getMax( ) throw(::com::sun::star::uno::RuntimeException); +void SAL_CALL setFirst( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); +sal_Int64 SAL_CALL getFirst( ) throw(::com::sun::star::uno::RuntimeException); +void SAL_CALL setLast( sal_Int64 Time ) throw(::com::sun::star::uno::RuntimeException); +sal_Int64 SAL_CALL getLast( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setEmpty( ) throw(::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL isEmpty( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setStrictFormat( sal_Bool bStrict ) throw(::com::sun::star::uno::RuntimeException); diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index 30f1bf6..1fa03a8 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -39,9 +39,12 @@ protected: voidImplSetPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues, sal_Bool bUpdateThis ); ::com::sun::star::uno::Any ImplGetPropertyValue( const OUString& aPropertyName ); +template T ImplGetPropertyValuePOD( sal_uInt16 nProp ); +template T ImplGetPropertyValueClass( sal_uInt16 nProp ); sal_BoolImplGetPropertyValue_BOOL( sal_uInt16 nProp ); sal_Int16 ImplGetPropertyValue_INT16( sal_uInt16 nProp ); sal_Int32 ImplGetPropertyValue_INT32( sal_uInt16 nProp ); +sal_Int64 ImplGetPropertyValue_INT64( sal_uInt16 nProp ); doubl
Re: [libreoffice-l10n] Invalid Entry in Po Files
Thanks everybody for your help now that I have corrected all problems and once again had nice build on both Ubuntu and Windows. Now additional array of help requests: 1) I want to build the LO with Spellchecker and Help Pack included in the installer. Providing a separate installation of Help and Spellchecker extension is not good way as many of our user have little experience with software installation. 2) Can I change the installer language to be mine, it is now in English. 3) The MSI installer I built is shows a 'Beta' Splash Screen and is installed as "LibreOfficeDev4.1.1.0.0", how can I produce LibreOffice 4.x.x.x like the official installer. Regards, On Wed, Jul 31, 2013 at 8:07 PM, Zolnai Tamás wrote: > 2013/7/31 Andras Timar > >> Hi Tadele, >> >> On Wed, Jul 31, 2013 at 5:44 PM, Tadele Assefa >> wrote: >> > Meld Diff Viewer. The difference I spotted appeared at the bottom of >> the >> > files with many more comments in my file than the Hungarian one. Can >> that >> > be a cause? >> > >> >> Yes, it is the cause. Remove those obsolete entries from the end of >> the file. As far as I remember, Tamas Zolnai fixed this misbehaviour >> in po parser in master and libreoffice-4-1. I guess you are compiling >> LibreOffice 4.0.x > > > Yes, I did and so comments at the end of the files doesn't make the parser > to skip strings, but warnings are still alive. It can be helpful to avoid > useless lines from git repository. So these warnings can appear in 4.1 too, > but strings are merged, as long as there are no other problem. > However as I see this is not true. > > For example: > msgid "There are no pages to be printed. Please check your document for > ranges relevant to printing." > msgstr "" > "Attamantanno qoolla dino. Eeggatena bortajekki attamote hakkigeeshsha > buuxi." > > If the translation doesn't include end line than it have to stand directly > behind msgstr, like this: > msgstr "Attamantanno qoolla dino. Eeggatena bortajekki attamote > hakkigeeshsha buuxi." > > Other example (with the same problem): > "msgid "Click '%OK' to start %PRODUCTNAME %PRODUCTVERSION without > accessibility support, or click '%CANCEL' to exit %PRODUCTNAME > %PRODUCTVERSION." > msgstr "" > "Click '%OK' to start %PRODUCTNAME %PRODUCTVERSION without accessibility " > "support, or click '%CANCEL' to exit %PRODUCTNAME %PRODUCTVERSION."" > > Andras, as I remember you said, you use msgcat to get this kind of result. > That's why LO po parser works this kind of po files. > > Best regards, > Tamás > > -- Regards,* ___ Tadele Assefa Managing Director* * Cell: +25-911-84-13-84* *Think Green – Please do not print this email unless you really need to* ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2.hxx |8 +++
basctl/source/basicide/baside2b.cxx | 73
2 files changed, 81 insertions(+)
New commits:
commit 287b5c42b7fcf035a0a52c241c0a5f53c151ea4e
Author: Gergo Mocsi
Date: Fri Aug 2 12:32:13 2013 +0200
GSOC work, show the cursor when typing 2
There are two cases:
a) TextView in focus: cursor is visible, typing works, except the arrow
keys are not working for the ListBox
b) ListBox in focus: no cursor, everything works
Change-Id: Iaaec69c04370e4d05e226abeecd420bf4d4f52cd
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 42904b2..5618f76 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -76,6 +76,7 @@ void setTextEngineText (ExtTextEngine&, OUString const&);
class EditorWindow : public Window, public SfxListener
{
+friend class CodeCompleteListBox;
private:
class ChangesListener;
@@ -475,6 +476,7 @@ private:
class CodeCompleteListBox: public ListBox
{
friend class CodeCompleteWindow;
+friend class EditorWindow;
private:
OUStringBuffer aFuncBuffer;
/* a buffer to build up function name when typing
@@ -489,9 +491,12 @@ public:
void InsertSelectedEntry(); //insert the selected entry
DECL_LINK(ImplDoubleClickHdl, void*);
+//DECL_LINK(ImplSelectionChangeHdl, void*);
virtual long PreNotify( NotifyEvent& rNEvt );
+protected:
+virtual void KeyInput( const KeyEvent& rKeyEvt );
};
class CodeCompleteWindow: public Window
@@ -519,6 +524,9 @@ public:
* clears if typed anything, then hides
* the window, clear internal variables
* */
+OUStringBuffer& GetListBoxBuffer();
+void SetVisibleEntries(); // sets the visible entries based on aFuncBuffer
variable
+CodeCompleteListBox* GetListBox(){return pListBox;}
};
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index a18e475..fe9da85 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -502,6 +502,13 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
// see if there is an accelerator to be processed first
bool bDone = SfxViewShell::Current()->KeyInput( rKEvt );
+//sal_Unicode aChar = rKEvt.GetKeyCode().GetCode();
+if( pCodeCompleteWnd->IsVisible() )
+{
+std::cerr << "EditorWindow::KeyInput" << std::endl;
+pCodeCompleteWnd->GetListBox()->KeyInput(rKEvt);
+}
+
if( (rKEvt.GetKeyCode().GetCode() == KEY_SPACE ||
rKEvt.GetKeyCode().GetCode() == KEY_TAB ||
rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) &&
CodeCompleteOptions::IsAutoCorrectKeywordsOn() )
@@ -757,6 +764,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
pCodeCompleteWnd->ResizeListBox();
pCodeCompleteWnd->SelectFirstEntry();
pEditView->GetWindow()->GrabFocus();
+//pEditView->EnableCursor( true );
}
}
}
@@ -2538,6 +2546,7 @@ CodeCompleteListBox::CodeCompleteListBox(
CodeCompleteWindow* pPar )
pCodeCompleteWindow( pPar )
{
SetDoubleClickHdl(LINK(this, CodeCompleteListBox, ImplDoubleClickHdl));
+//SetSelectHdl(LINK(this, CodeCompleteListBox, ImplSelectionChangeHdl));
}
IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl)
@@ -2546,6 +2555,12 @@ IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl)
return 0;
}
+/*IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectionChangeHdl)
+{
+pCodeCompleteWindow->pParent->GrabFocus();
+return 0;
+}*/
+
void CodeCompleteListBox::InsertSelectedEntry()
{
if( !aFuncBuffer.toString().isEmpty() )
@@ -2586,6 +2601,7 @@ long CodeCompleteListBox::PreNotify( NotifyEvent& rNEvt )
{
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
+std::cerr << "CodeCompleteListBox::PreNotify" << std::endl;
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
sal_Unicode aChar = aKeyEvt.GetKeyCode().GetCode();
if( ( aChar >= KEY_A ) && ( aChar <= KEY_Z ) )
@@ -2593,6 +2609,7 @@ long CodeCompleteListBox::PreNotify( NotifyEvent& rNEvt )
pCodeCompleteWindow->pParent->GetEditView()->InsertText(
OUString(aKeyEvt.GetCharCode()) );
aFuncBuffer.append(aKeyEvt.GetCharCode());
SetVisibleEntries();
+
//pCodeCompleteWindow->pParent->GetEditView()->GetWindow()->GrabFocus();
return 0;
}
else
@@ -2629,9 +2646,13 @@ long CodeCompleteListBox::PreNotify( NotifyEvent& rNEvt )
case KEY_RETURN:
InsertSelectedEntry();
return 0;
+/*case KEY_UP: case KEY_DOWN:
+std::cerr << "up/down ke in PreNotify" << std::endl;
+break;*/
}
}
}
+//pCo
Create Print Dialog
Hello, I want to create a custom print dialog using LO. Before LO 4.0 there was already a print dialog working well, but since the update to 4.0 it is not working anymore as some classes of UNO are deprecated. Is it still possible to create a custom print dialog using LO? If you need further informations on what I want to do, let me know. Sincerely, Hasnaoui, Ahmed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcframegrabber.cxx |4 ++--
avmedia/source/vlc/vlcplayer.cxx | 30 --
avmedia/source/vlc/vlcplayer.hxx |1 +
3 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 4580191af3dfbe5562c6d5912991e48ac1c4e230
Author: Minh Ngo
Date: Wed Jul 31 09:18:36 2013 +0300
Playback loop
Change-Id: I18c544dadb553e7e173e9e377a337aa2b7eecb60
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx
b/avmedia/source/vlc/vlcframegrabber.cxx
index efabd39..4630f15 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -34,7 +34,7 @@ namespace
{
void EventHandler( const libvlc_event_t *evemt, void *pData )
{
-switch (evemt->type)
+switch ( evemt->type )
{
case libvlc_MediaPlayerPaused:
osl::Condition *condition = static_cast( pData );
@@ -53,7 +53,7 @@ namespace
libvlc_event_attach( manager, libvlc_MediaPlayerPaused, EventHandler,
&condition );
libvlc_audio_set_mute( player, true );
-if (libvlc_media_player_play( player ) == -1)
+if ( libvlc_media_player_play( player ) == -1 )
{
std::cerr << "Couldn't play" << std::endl;
}
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index c4628ed..ca32ef8 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -42,6 +42,7 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url )
, mMedia( InitMedia( url, mInstance ), libvlc_media_release )
, mPlayer( libvlc_media_player_new_from_media( mMedia.get() ),
libvlc_media_player_release )
, mUrl( url )
+, mPlaybackLoop( false )
{
}
@@ -98,13 +99,38 @@ double SAL_CALL VLCPlayer::getRate()
return libvlc_media_player_get_rate( mPlayer.get() );
}
+namespace
+{
+void EventHandler( const libvlc_event_t *evemt, void *pData )
+{
+switch (evemt->type)
+{
+case libvlc_MediaPlayerEndReached:
+boost::shared_ptr player = *static_cast<
boost::shared_ptr* >( pData );
+libvlc_media_player_stop( player.get() );
+libvlc_media_player_play( player.get() )
+break;
+}
+}
+}
+
void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet )
{
+::osl::MutexGuard aGuard(m_aMutex);
+mPlaybackLoop = bSet;
+
+libvlc_event_manager_t *manager = libvlc_media_player_event_manager(
mPlayer.get() );
+
+if ( bSet )
+libvlc_event_attach( manager, libvlc_MediaPlayerEndReached,
EventHandler, &mPlayer );
+else
+libvlc_event_detach( manager, libvlc_MediaPlayerEndReached,
EventHandler, &mPlayer );
}
::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop()
{
-return false;
+::osl::MutexGuard aGuard(m_aMutex);
+return mPlaybackLoop;
}
void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB )
@@ -210,4 +236,4 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL
VLCPlayer::createFrameGrabb
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index 8113602..acdee37 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -41,6 +41,7 @@ class VLCPlayer : public ::cppu::BaseMutex,
boost::shared_ptr mMedia;
boost::shared_ptr mPlayer;
const rtl::OUString mUrl;
+bool mPlaybackLoop;
public:
VLCPlayer( const rtl::OUString& url );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/inc sd/source
sd/inc/drawdoc.hxx |4 +-
sd/source/core/drawdoc.cxx |7
sd/source/core/sdpage.cxx | 69 ++---
3 files changed, 7 insertions(+), 73 deletions(-)
New commits:
commit 04d512a6515a38613aab7174d969819e0c71773e
Author: Vishv Brahmbhatt
Date: Fri Aug 2 14:27:02 2013 +0530
Getting vector from "SdDrawDocument"
Deleting some of the unused methods.Also there is some
"filter-test/unit-test" error associated with "drawdoc.cxx" methods.
But the functionality is working as desired.This one for the quick
reference.I am trying to remove those errors in next commit.
Change-Id: I2d5507e1945c5d33f72df3b3ec14dc12ee420c16
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 066cc1a..cce2bc5 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -188,7 +188,7 @@ private:
DECL_LINK(OnlineSpellEventHdl, EditStatus*);
std::vector< OUString > maAnnotationAuthors;
-
std::vector>
layoutinfo;
+
std::vector>
malayoutinfo;
boolmbUseEmbedFonts;
@@ -260,7 +260,7 @@ public:
bool IsStartWithPresentation() const;
void SetStartWithPresentation( bool bStartWithPresentation );
void SetLayoutVector();
-
std::vector>
GetLayoutVector();
+inline
std::vector>&
GetLayoutVector(){ return malayoutinfo; }
/** Insert pages into this document
This method inserts whole pages into this document, either
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index ca12a96..f9ccd9e 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -1058,12 +1058,7 @@ void SdDrawDocument::SetLayoutVector()
for(int index=0; index layoutnode = layoutlist->item(index); //get i'th
layout element
-layoutinfo.push_back(layoutnode);
+malayoutinfo.push_back(layoutnode);
}
}
-
-std::vector> GetLayoutVector()
-{
-return layoutinfo;
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 43f1295..715753b 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1190,53 +1190,6 @@ static const LayoutDescriptor& GetLayoutDescriptor(
AutoLayout eLayout )
return aLayouts[ eLayout - AUTOLAYOUT__START ];
}
-#define EXPAND_PROTOCOL "vnd.sun.star.expand:"
-//to get the root element of the xml file
-Reference getRootElement()
-{
-const Reference
xContext(comphelper_getProcessComponentContext());
-Reference< XMultiServiceFactory >
xServiceFactory(xContext->getServiceManager(), UNO_QUERY_THROW );
-Reference< util::XMacroExpander > xMacroExpander
=util::theMacroExpander::get(xContext);
-Reference< XMultiServiceFactory > xConfigProvider
=configuration::theDefaultProvider::get( xContext );
-
-Any propValue = uno::makeAny(
-beans::PropertyValue(
-"nodepath", -1,
-uno::makeAny( OUString( "/org.openoffice.Office.Impress/Misc" )),
-beans::PropertyState_DIRECT_VALUE ) );
-
-Reference xNameAccess(
-xConfigProvider->createInstanceWithArguments(
-"com.sun.star.configuration.ConfigurationAccess",
-Sequence( &propValue, 1 ) ), UNO_QUERY_THROW );
-Sequence< rtl::OUString > aFiles;
-xNameAccess->getByName( "LayoutListFiles" ) >>= aFiles;
-rtl::OUString aURL;
-for( sal_Int32 i=0; iexpandMacros( aMacro );
-}
-}
-if( aURL.startsWith( "file://" ) )
-{
-rtl::OUString aSysPath;
-if( osl_getSystemPathFromFileURL( aURL.pData, &aSysPath.pData ) ==
osl_File_E_None )
-aURL = aSysPath;
-}
-const Reference
xDocBuilder(css::xml::dom::DocumentBuilder::create(comphelper::getComponentContext(xServiceFactory)));
-const Reference xDoc = xDocBuilder->parseURI(aURL);
-const Reference xRoot = xDoc->getDocumentElement();
-return xRoot;//this loops seems to work only once,so temporary returning
the root element
-}
-
rtl::OUString enumtoString(AutoLayout aut)
{
rtl::OUString retstr;
@@ -1283,19 +1236,6 @@ rtl::OUString enumtoString(AutoLayout aut)
return retstr;
}
-void parseXml()
-{
-int layoutlistsize;
-const Reference root= getRootElement();//get the root element of
my xml file
-const Reference layoutlist =
root->getElementsByTagName("layout");
-layoutlistsize=layoutlist->getLength();
-for(int index=0; index layoutnode = layoutlist->item(index); //get i'th
layout element
-layoutinfo.push_back(layoutnode);
-}
-}
-
static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle*
rRectangle ,const rtl::OUString& autolayout)
{
Rectangle aTitleRect;
@@ -1304,6 +1244,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int
nLayout, Rectangle* rRe
rtl::OUString sLayoutAttName;
rtl::OUString sPresObjKindAttName;
double propvalue[4];
+std::vector> malayoutinfo;
if(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/inc/namemgrtable.hxx |1 +
sc/source/ui/namedlg/namemgrtable.cxx | 19 ++-
2 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit e0df4fa62162b023b29a323ed4c70594a8ec47c4
Author: Kohei Yoshida
Date: Thu Aug 1 10:27:27 2013 -0400
fdo#67621: Delay populating the ranges until the dialog is shown.
Otherwise the table widget won't have any idea which rows are displayed,
and end up not populating the ranges.
This is caused by the switch to the .ui dialog, which delays calculation
of the dialog size until late. But the code that populates the ranges was
execuated when the widget was instantiated, at which time the widget didn't
have its size assigned.
Change-Id: I22943b41b21b58cc67e872dff13ad3c25eee8438
(cherry picked from commit b8b807ae589a0b0daa101a0b00bcbe21aa138e2f)
Reviewed-on: https://gerrit.libreoffice.org/5227
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/inc/namemgrtable.hxx
b/sc/source/ui/inc/namemgrtable.hxx
index 3c806cd..08bd36d 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -55,6 +55,7 @@ public:
virtual ~ScRangeManagerTable();
virtual void Resize();
+virtual void StateChanged( StateChangedType nStateChange );
void addEntry( const ScRangeNameLine& rLine, bool bSetCurEntry = true );
void DeleteSelectedEntries();
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index b7305fc..304f53b 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -61,11 +61,6 @@ ScRangeManagerTable::ScRangeManagerTable(
SvxSimpleTableContainer& rParent, boos
Init();
ShowTable();
SetSelectionMode(MULTIPLE_SELECTION);
-if (GetEntryCount())
-{
-SetCurEntry(GetEntryOnPos(0));
-CheckForFormulaString();
-}
SetScrolledHdl( LINK( this, ScRangeManagerTable, ScrollHdl ) );
void* pNull = NULL;
HeaderEndDragHdl(pNull);
@@ -78,6 +73,20 @@ void ScRangeManagerTable::Resize()
setColWidths();
}
+void ScRangeManagerTable::StateChanged( StateChangedType nStateChange )
+{
+SvSimpleTable::StateChanged(nStateChange);
+
+if (nStateChange == STATE_CHANGE_INITSHOW)
+{
+if (GetEntryCount())
+{
+SetCurEntry(GetEntryOnPos(0));
+CheckForFormulaString();
+}
+}
+}
+
void ScRangeManagerTable::setColWidths()
{
HeaderBar &rHeaderBar = GetTheHeaderBar();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 502a066c75389285328be3a3c2f8b0a6d2d5aa2c Author: Csikós Tamás Date: Wed Jul 31 14:02:11 2013 +0200 Updated core Project: help e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 update help ids for date time dialog .ui conversion Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753 Reviewed-on: https://gerrit.libreoffice.org/5214 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 1d342b5..e56f7c1 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1d342b5132ae3c6efbbb8b81df14726c2ef15d59 +Subproject commit e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/rep_datetime.xhp | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) New commits: commit dd74d327294ac10372f0fc38a545b2f629d76632 Author: Caolán McNamara Date: Fri Aug 2 10:45:55 2013 +0200 datetimedialog path segment missing Change-Id: Iaf7961e201e3597bcaa25f10c51e1369562d4168 diff --git a/source/text/shared/explorer/database/rep_datetime.xhp b/source/text/shared/explorer/database/rep_datetime.xhp index bdf4821..463bdf5 100644 --- a/source/text/shared/explorer/database/rep_datetime.xhp +++ b/source/text/shared/explorer/database/rep_datetime.xhp @@ -29,18 +29,16 @@ -Date and Time + + +Date and Time You can open the Date and Time dialog of the Report Builder by choosing Insert - Date and Time. Press Shift-F1 and point with the mouse at an input box to see a help text for this input box. -Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed. - - -Select a format to display the date. -Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed. - - -Select a format to display the time. +Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed. +Select a format to display the date. +Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed. +Select a format to display the time. Click OK to insert the field. You can click the date or time field and drag to another position within the same area, or edit the properties in the Properties window. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] update help ids for date time dialog .ui conversion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5214 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5214 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753 Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Tamás Csikós Gerrit-Reviewer: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |4 source/text/shared/explorer/database/rep_datetime.xhp |4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) New commits: commit e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 Author: Csikós Tamás Date: Wed Jul 31 14:02:11 2013 +0200 update help ids for date time dialog .ui conversion Change-Id: Icbdc3b9cab375db8caf694c65ada055d70f59753 Reviewed-on: https://gerrit.libreoffice.org/5214 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index eca4e7a..38a7d60 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6224,10 +6224,6 @@ framework_MultiLineEdit_DLG_LICENSE_ML_LICENSE,1077938699, framework_PushButton_DLG_LICENSE_PB_ACCEPT,1077940759, framework_PushButton_DLG_LICENSE_PB_DECLINE,1077940758, framework_PushButton_DLG_LICENSE_PB_PAGEDOWN,1077940754, -reportdesign_CheckBox_RID_DATETIME_DLG_CB_DATE,1577878529, -reportdesign_CheckBox_RID_DATETIME_DLG_CB_TIME,1577878533, -reportdesign_ListBox_RID_DATETIME_DLG_LB_DATE_TYPE,1577881091, -reportdesign_ListBox_RID_DATETIME_DLG_LB_TIME_TYPE,1577881095, reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236, reportdesign_ListBox_RID_GROUPS_SORTING_LST_GROUPONLST,2114719238, reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234, diff --git a/source/text/shared/explorer/database/rep_datetime.xhp b/source/text/shared/explorer/database/rep_datetime.xhp index 15e0ed0..bdf4821 100644 --- a/source/text/shared/explorer/database/rep_datetime.xhp +++ b/source/text/shared/explorer/database/rep_datetime.xhp @@ -33,11 +33,11 @@ You can open the Date and Time dialog of the Report Builder by choosing Insert - Date and Time. Press Shift-F1 and point with the mouse at an input box to see a help text for this input box. -Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed. +Enable Include Date to insert a date field into the active area of the report. The date field displays the current date when the report is executed. Select a format to display the date. -Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed. +Enable Include Time to insert a time field into the active area of the report. The time field displays the current time when the report is executed. Select a format to display the time. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 784cfa382be438240dfc936b7551c5012aada9ae Author: Caolán McNamara Date: Fri Aug 2 10:45:55 2013 +0200 Updated core Project: help dd74d327294ac10372f0fc38a545b2f629d76632 diff --git a/helpcontent2 b/helpcontent2 index e56f7c1..dd74d32 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e56f7c1e00ee2d6e23c81719319126c84eeb2bb6 +Subproject commit dd74d327294ac10372f0fc38a545b2f629d76632 ___ 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' - 73/34341e5986b7685866a836195fd6d189293cab
73/34341e5986b7685866a836195fd6d189293cab |1 + 1 file changed, 1 insertion(+) New commits: commit de1d762b2a5e98bedc6bff508a41135465928eb1 Author: Caolán McNamara Date: Fri Aug 2 10:28:55 2013 +0200 Notes added by 'git notes add' diff --git a/73/34341e5986b7685866a836195fd6d189293cab b/73/34341e5986b7685866a836195fd6d189293cab new file mode 100644 index 000..4b5612a --- /dev/null +++ b/73/34341e5986b7685866a836195fd6d189293cab @@ -0,0 +1 @@ +merged as: 6f1b6f6527b06b15aa29ccfd7089a9fb382d42d7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - reportdesign/inc reportdesign/source reportdesign/uiconfig sw/source
reportdesign/inc/helpids.hrc|1 -
reportdesign/source/ui/dlg/DateTime.cxx | 20 +---
reportdesign/uiconfig/dbreport/ui/datetimedialog.ui |3 ++-
sw/source/core/layout/layact.cxx| 17 +++--
4 files changed, 22 insertions(+), 19 deletions(-)
New commits:
commit 6f1b6f6527b06b15aa29ccfd7089a9fb382d42d7
Author: Herbert Dürr
Date: Fri Aug 2 07:59:30 2013 +
Resolves: #i122885# handle SmartTag related exceptions gracefully
and support diagnostics by providing exception details
(cherry picked from commit 7334341e5986b7685866a836195fd6d189293cab)
Conflicts:
sw/source/core/layout/layact.cxx
Change-Id: I18f4ddafd48f53329d313ada5fe1624974a61894
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 71659ce..cc14c74 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2088,12 +2088,17 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt,
IdleJobType eJob )
}
case SMART_TAGS : // SMARTTAGS
{
-const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan(
pCntntNode, nTxtPos ) );
-bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty();
-if( !bPageValid )
-bAllValid = sal_False;
-if ( aRepaint.HasArea() )
-pImp->GetShell()->InvalidateWindows( aRepaint );
+try {
+const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan(
pCntntNode, nTxtPos ) );
+bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty();
+if( !bPageValid )
+bAllValid = sal_False;
+if ( aRepaint.HasArea() )
+pImp->GetShell()->InvalidateWindows( aRepaint );
+} catch( const ::com::sun::star::uno::RuntimeException& e) {
+// #i122885# handle smarttag problems gracefully and
provide diagnostics
+SAL_WARN( "sw.core", "SMART_TAGS Exception:" << e.Message);
+}
if ( Application::AnyInput(
VCL_INPUT_MOUSEANDKEYBOARD|VCL_INPUT_OTHER|VCL_INPUT_PAINT ) )
return sal_True;
break;
commit 4f950ffb896ce3fb8af6f422a53ea132bc055e1c
Author: Caolán McNamara
Date: Fri Aug 2 10:10:32 2013 +0200
small expand tweak
+
a) use default dropdown count
b) SAL_N_ELEMENTS
Change-Id: I67f12137eedb19bcaf79309fc64bf5c29a70e64d
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc
index ec0d163..69a581a 100644
--- a/reportdesign/inc/helpids.hrc
+++ b/reportdesign/inc/helpids.hrc
@@ -41,7 +41,6 @@
#define HID_RPT_SORTORDER
"REPORTDESIGN_HID_RPT_SORTORDER"
#define HID_RPT_GROUPSBRW
"REPORTDESIGN_HID_RPT_GROUPSBRW"
#define HID_RPT_GROUPSSORTING_DLG
"REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG"
-#define HID_RPT_DATETIME_DLG
"REPORTDESIGN_HID_RPT_DATETIME_DLG"
#define HID_RPT_CONDFORMAT_DLG
"REPORTDESIGN_HID_RPT_CONDFORMAT_DLG"
#define HID_RPT_CONDFORMAT_TB
"REPORTDESIGN_HID_RPT_CONDFORMAT_TB"
#define HID_RPT_CRTL_FORMAT_PREVIEW
"REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW"
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx
b/reportdesign/source/ui/dlg/DateTime.cxx
index fecfb0b..2740fdb 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -53,10 +53,10 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
,OReportController* _pController)
: ModalDialog( _pParent, "DateTimeDialog" ,
"modules/dbreport/ui/datetimedialog.ui" )
-,m_aDateControlling()
-,m_aTimeControlling()
-,m_pController(_pController)
-,m_xHoldAlive(_xHoldAlive)
+, m_aDateControlling()
+, m_aTimeControlling()
+, m_pController(_pController)
+, m_xHoldAlive(_xHoldAlive)
{
get(m_pDate,"date");
get(m_pFTDateFormat,"datelistbox_label");
@@ -76,23 +76,21 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
InsertEntry(util::NumberFormat::DATE);
InsertEntry(util::NumberFormat::TIME);
}
-catch(uno::Exception&)
+catch (const uno::Exception&)
{
}
-m_pDateListBox->SetDropDownLineCount(20);
m_pDateListBox->SelectEntryPos(0);
-m_pTimeListBox->SetDropDownLineCount(20);
m_pTimeListBox->SelectEntryPos(0);
// use nice enhancement, to toggle enable/disable if a checkbox is checked
or not
m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat,
*m_pDateListBox);
m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat,
*m_pTimeListBox);
-CheckBox* pCheck
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dtrans/source
dtrans/source/win32/dtobj/FetcList.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 1366aed01033f10639dcadb5511917391eba01a1
Author: Herbert Dürr
Date: Tue Jul 16 13:30:18 2013 +
#i122752# check iterator in each iteration of
CFormatEtcContainer::nextFormatEtc()'s loop
Don't trust nextFormatEtc()'s aNum argument not to mislead the iterator
beyond
the container bounds. The comparable loop in
CFormatEtcContainer::skipFormatEtc()
already checks the iterator against the container end in each iteration.
(cherry picked from commit a609daa146c5588c6a35c2c145e9573c625ec123)
Signed-off-by: Jan Holesovsky
Change-Id: Ie745497491679dfb172d78876c3a3731e153243e
Reviewed-on: https://gerrit.libreoffice.org/5241
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx
b/dtrans/source/win32/dtobj/FetcList.cxx
index 7031dac..8a30409 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -132,10 +132,11 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc(
LPFORMATETC lpFetc,
sal_uInt32 nFetched = 0;
-if ( m_EnumIterator != m_FormatMap.end( ) )
+for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++,
++m_EnumIterator )
{
-for ( sal_uInt32 i = 0; i < aNum; i++, nFetched++, lpFetc++,
++m_EnumIterator )
-CopyFormatEtc( lpFetc, *m_EnumIterator );
+if ( m_EnumIterator == m_FormatMap.end() )
+break;
+CopyFormatEtc( lpFetc, *m_EnumIterator );
}
return nFetched;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - Library_merged.mk
Library_merged.mk |1 + 1 file changed, 1 insertion(+) New commits: commit a444c621b8eea094c37018880ca847bcd28fd703 Author: Matúš Kukan Date: Thu May 23 12:18:55 2013 +0200 libmerged needs -lrt too since 9830fd36dbdb72c79703b0c61efc027fba793c5a Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976 Reviewed-on: https://gerrit.libreoffice.org/5240 Reviewed-by: Petr Mladek Tested-by: Petr Mladek diff --git a/Library_merged.mk b/Library_merged.mk index 959db0e..6e404df 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_libs,merged,\ -lm \ -ldl \ -lpthread \ + -lrt \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/AllLangResTarget_rptui.mk reportdesign/source reportdesign/uiconfig reportdesign/UIConfig_dbreport.mk
reportdesign/AllLangResTarget_rptui.mk |1
reportdesign/UIConfig_dbreport.mk |1
reportdesign/source/ui/dlg/DateTime.cxx | 70 +++
reportdesign/source/ui/dlg/DateTime.hrc | 49 -
reportdesign/source/ui/dlg/DateTime.src | 126 -
reportdesign/source/ui/inc/DateTime.hxx | 20 --
reportdesign/uiconfig/dbreport/ui/datetimedialog.ui | 193
7 files changed, 236 insertions(+), 224 deletions(-)
New commits:
commit 1f0da38c7d132cfc64e977454ebc2eab35f18ba0
Author: Csikós Tamás
Date: Wed Jul 31 13:37:41 2013 +0200
modern .ui widgetlayout for datetime
widget found at: database/insert/report -> insert/Date and Time
Change-Id: I8d0f388bd8e3eb7169e24570beeb7d6b513b8d05
Reviewed-on: https://gerrit.libreoffice.org/5213
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/reportdesign/AllLangResTarget_rptui.mk
b/reportdesign/AllLangResTarget_rptui.mk
index 7997d02..c913f7e 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
reportdesign/source/ui/dlg/dlgpage.src \
reportdesign/source/ui/dlg/PageNumber.src \
- reportdesign/source/ui/dlg/DateTime.src \
reportdesign/source/ui/dlg/CondFormat.src \
reportdesign/source/ui/dlg/Navigator.src\
reportdesign/source/ui/dlg/GroupsSorting.src \
diff --git a/reportdesign/UIConfig_dbreport.mk
b/reportdesign/UIConfig_dbreport.mk
index 3ede087..e8c6904 100644
--- a/reportdesign/UIConfig_dbreport.mk
+++ b/reportdesign/UIConfig_dbreport.mk
@@ -36,5 +36,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/dbreport,\
$(eval $(call gb_UIConfig_add_uifiles,modules/dbreport,\
reportdesign/uiconfig/dbreport/ui/pagenumberdialog \
+ reportdesign/uiconfig/dbreport/ui/datetimedialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx
b/reportdesign/source/ui/dlg/DateTime.cxx
index 5ad27ab..fecfb0b 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "DateTime.hxx"
-#include "DateTime.hrc"
#include
#include
#include "RptResId.hrc"
@@ -52,23 +51,21 @@ DBG_NAME( rpt_ODateTimeDialog )
ODateTimeDialog::ODateTimeDialog( Window* _pParent
,const uno::Reference<
report::XSection >& _xHoldAlive
,OReportController* _pController)
-: ModalDialog( _pParent, ModuleRes(RID_DATETIME_DLG) )
-,m_aDate(this, ModuleRes(CB_DATE ) )
-,m_aFTDateFormat(this, ModuleRes(FT_DATE_FORMAT ) )
-,m_aDateListBox(this,ModuleRes(LB_DATE_TYPE ) )
-,m_aFL0(this,ModuleRes(FL_SEPARATOR0) )
-,m_aTime(this, ModuleRes(CB_TIME ) )
-,m_aFTTimeFormat(this, ModuleRes(FT_TIME_FORMAT ) )
-,m_aTimeListBox(this,ModuleRes(LB_TIME_TYPE ) )
-,m_aFL1(this, ModuleRes(FL_SEPARATOR1) )
-,m_aPB_OK(this, ModuleRes(PB_OK))
-,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL))
-,m_aPB_Help(this, ModuleRes(PB_HELP))
+: ModalDialog( _pParent, "DateTimeDialog" ,
"modules/dbreport/ui/datetimedialog.ui" )
+
,m_aDateControlling()
,m_aTimeControlling()
,m_pController(_pController)
,m_xHoldAlive(_xHoldAlive)
{
+get(m_pDate,"date");
+get(m_pFTDateFormat,"datelistbox_label");
+get(m_pDateListBox,"datelistbox");
+get(m_pTime,"time");
+get(m_pFTTimeFormat,"timelistbox_label");
+get(m_pTimeListBox,"timelistbox");
+get(m_pPB_OK,"ok");
+
DBG_CTOR( rpt_ODateTimeDialog,NULL);
try
@@ -83,29 +80,28 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
{
}
-m_aDateListBox.SetDropDownLineCount(20);
-m_aDateListBox.SelectEntryPos(0);
+m_pDateListBox->SetDropDownLineCount(20);
+m_pDateListBox->SelectEntryPos(0);
-m_aTimeListBox.SetDropDownLineCount(20);
-m_aTimeListBox.SelectEntryPos(0);
+m_pTimeListBox->SetDropDownLineCount(20);
+m_pTimeListBox->SelectEntryPos(0);
// use nice enhancement, to toggle enable/disable if a checkbox is checked
or not
-m_aDateControlling.enableOnCheckMark( m_aDate, m_aFTDateFormat,
m_aDateListBox);
-m_aTimeControlling.enableOnCheckMark( m_aTime, m_aFTTimeFormat,
m_aTimeListBox);
+m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat,
*m_pDateListBox);
+m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat,
*m_pTimeListBox);
-CheckBox* pCheckBoxes[] = { &m_aDate,&m_aTime};
+CheckBox* pCheckBoxes[] = { m_pDate,m_pTime};
for ( size_t i = 0 ; i
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/layout/layact.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 7334341e5986b7685866a836195fd6d189293cab
Author: Herbert Dürr
Date: Fri Aug 2 07:59:30 2013 +
#i122885# handle SmartTag related exceptions gracefully
and support diagnostics by providing exception details to stderr
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 84dc484..83cf9a7 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2218,12 +2218,17 @@ sal_Bool SwLayIdle::_DoIdleJob( const SwCntntFrm *pCnt,
IdleJobType eJob )
}
case SMART_TAGS : // SMARTTAGS
{
-const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan(
pCntntNode, nTxtPos ) );
-bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty();
-if( !bPageValid )
-bAllValid = sal_False;
-if ( aRepaint.HasArea() )
-pImp->GetShell()->InvalidateWindows( aRepaint );
+try {
+const SwRect aRepaint( ((SwTxtFrm*)pCnt)->SmartTagScan(
pCntntNode, nTxtPos ) );
+bPageValid = bPageValid && !pTxtNode->IsSmartTagDirty();
+if( !bPageValid )
+bAllValid = sal_False;
+if ( aRepaint.HasArea() )
+pImp->GetShell()->InvalidateWindows( aRepaint );
+} catch( const ::com::sun::star::uno::RuntimeException& e) {
+// #i122885# handle smarttag problems gracefully and
provide diagnostics
+fprintf( stderr, "SMART_TAGS Exception: %s\n",
rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+}
if ( Application::AnyInput(
INPUT_MOUSEANDKEYBOARD|INPUT_OTHER|INPUT_PAINT ) )
return sal_True;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
