reverted FCFGMerge change
Hey Michael, I just reverted the switch to Python FCFGMerge. It seems to not work correctly and I think we need the tinderboxes to detect the serious errors until the feature freeze. Please have a look at the tinderbox logs, maybe we can easily fix it. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/Configuration_filter.mk
filter/Configuration_filter.mk |5 + 1 file changed, 5 insertions(+) New commits: commit ed10194ea833b42b486bdc5b4c18ef7e63862b89 Author: Markus Mohrhard Date: Fri Nov 30 23:50:12 2012 +0100 Revert "filter: try to use the Python implementation of FCFGMerge" This reverts commit ebb4150463ef97571d8f4ffc0b8189ff94d5cf1a. diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index f84058e..dd4a09d 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -21,10 +21,15 @@ # most of the rules here use some weird merge program, and this is sort of # semi-integrated with the stuff from Configuration.mk; not exactly pretty... +ifeq ($(SOLAR_JAVA),) filter_MERGE_TARGET := $(gb_PYTHONTARGET) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(gb_PYTHON) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge +else # SOLAR_JAVA +filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar +filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET) +endif filter_MERGE_CONFIG_TARGET := $(OUTDIR_FOR_BUILD)/inc/l10ntools/FCFGMerge.cfg ### filter configuration rules: generic stuff ### ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/localize.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9bfa09273ea0b7c9a351802d105230930951b901
Author: Andras Timar
Date: Fri Nov 30 23:29:00 2012 +0100
better error reporting in localize binary
Change-Id: Ic98a786fffd9d92b51669e2beaed434db1aca519
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index c4ed537..0737c61 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -233,7 +233,8 @@ void handleCommand(
if (osl::FileBase::getFileURLFromSystemPath(outDir, outDirUrl)
!= osl::FileBase::E_None)
{
-cerr << "Error: Cannot convert pathname to URL\n";
+cerr << "Error: Cannot convert pathname to URL in " <<
__FILE__ << ", in line " << __LINE__ << "\n"
+ << " outDir: " << OUStringToOString(outDir,
RTL_TEXTENCODING_ASCII_US).getStr() << "\n";
throw false; //TODO
}
osl::Directory::createPath(outDirUrl);
@@ -530,7 +531,8 @@ void handleProjects(char * sourceRoot, char const *
destRoot)
if (osl::FileBase::getFileURLFromSystemPath(root16, rootUrl)
!= osl::FileBase::E_None)
{
-cerr << "Error: Cannot convert pathname to URL\n";
+cerr << "Error: Cannot convert pathname to URL in " << __FILE__ << ",
in line " << __LINE__ << "\n"
+ << " root16: " << OUStringToOString(root16,
RTL_TEXTENCODING_ASCII_US).getStr() << "\n";
throw false; //TODO
}
handleDirectory(rootUrl, 0, OString(), OString(), OString(destRoot));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: to-wiki/wikiconv2.py
to-wiki/wikiconv2.py |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 2fe3e715144881d57cce1d8aac7e0ca9c72c9bc8
Author: Andras Timar
Date: Fri Nov 30 22:56:10 2012 +0100
tweaks in order to parse LibreLogo help (not perfect)
Change-Id: I4e75d485ad5f663b9ed68f3504a43280ba56b965
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 3e0e159..5b68912 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -36,6 +36,7 @@ replace_paragraph_role = \
'head1': '= ', # used only in one file, probably in error?
'head2': '== ', # used only in one file, probably in error?
'listitem': '',
+ 'logocode': '',
'note': '{{Note|',
'null': '', # special paragraph for Variable, CaseInline, etc.
'paragraph': '',
@@ -65,6 +66,7 @@ replace_paragraph_role = \
'head1': ' =\n\n', # used only in one file, probably in error?
'head2': ' ==\n\n', # used only in one file, probably in error?
'listitem': '',
+'logocode': '\n\n',
'note': '}}\n\n',
'null': '', # special paragraph for Variable, CaseInline, etc.
'paragraph': '\n\n',
@@ -94,6 +96,7 @@ replace_paragraph_role = \
'head1': False,
'head2': False,
'listitem': False,
+ 'logocode': False,
'note': True,
'null': False,
'paragraph': False,
@@ -571,6 +574,8 @@ class ListItem(ElementBase):
self.embed_href(parser, fname, id)
elif name == 'paragraph':
parser.parse_localized_paragraph(ListItemParagraph(attrs, self),
attrs, self)
+elif name == 'list':
+self.parse_child(List(attrs, self))
else:
self.unhandled_element(parser, name)
@@ -1051,7 +1056,7 @@ class Paragraph(ElementBase):
# the text itself
children = ElementBase.get_all(self)
-if self.role != 'emph' and self.role != 'bascode':
+if self.role != 'emph' and self.role != 'bascode' and self.role !=
'logocode':
children = children.strip()
if len(children) == 0:
@@ -1143,6 +1148,8 @@ class TableContentParagraph(Paragraph):
self.role = 'tablecontentcode'
elif self.role == 'bascode':
self.role = 'tablecontentcode'
+elif self.role == 'logocode':
+self.role = 'tablecontentcode'
else:
self.role = 'tablecontent'
if self.role == 'tablehead':
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f66d0d6de34c8bf67a44e5696b28b3d857373b6a Author: Andras Timar Date: Fri Nov 30 22:56:10 2012 +0100 Updated core Project: help 2fe3e715144881d57cce1d8aac7e0ca9c72c9bc8 tweaks in order to parse LibreLogo help (not perfect) diff --git a/helpcontent2 b/helpcontent2 index b91788b..2fe3e71 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b91788bdfe56875a9342d011439f954e50d9c751 +Subproject commit 2fe3e715144881d57cce1d8aac7e0ca9c72c9bc8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/tabvwshc.cxx | 33 +
1 file changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 4026e1824de8ff9b5d006ae6eba491f91bc4e599
Author: Markus Mohrhard
Date: Fri Nov 30 22:19:45 2012 +0100
prevent uncloseable cond format dlg
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 152a940..289e605 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -204,30 +204,31 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
}
const ScConditionalFormat* pCondFormat =
pDoc->GetCondFormat(aPos.Col(), aPos.Row(), aPos.Tab());
+condformat::dialog::ScCondFormatDialogType eType =
condformat::dialog::NONE;
+switch(nSlotId)
+{
+case SID_OPENDLG_CONDFRMT:
+eType = condformat::dialog::CONDITION;
+break;
+case SID_OPENDLG_COLORSCALE:
+eType = condformat::dialog::COLORSCALE;
+break;
+case SID_OPENDLG_DATABAR:
+eType = condformat::dialog::DATABAR;
+break;
+default:
+break;
+}
+
if(pCondFormat)
{
const ScRangeList& rCondFormatRange = pCondFormat->GetRange();
if(rCondFormatRange == aRangeList)
-pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc,
pCondFormat, rCondFormatRange, aPos, condformat::dialog::NONE );
+pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc,
pCondFormat, rCondFormatRange, aPos, eType );
}
if(!pResult)
{
-condformat::dialog::ScCondFormatDialogType eType =
condformat::dialog::NONE;
-switch(nSlotId)
-{
-case SID_OPENDLG_CONDFRMT:
-eType = condformat::dialog::CONDITION;
-break;
-case SID_OPENDLG_COLORSCALE:
-eType = condformat::dialog::COLORSCALE;
-break;
-case SID_OPENDLG_DATABAR:
-eType = condformat::dialog::DATABAR;
-break;
-default:
-break;
-}
pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc, NULL,
aRangeList, aRangeList.GetTopLeftCorner(), eType );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - offapi/com offapi/type_reference reportdesign/source sc/inc sc/source sd/inc sd/source svx/source sw/inc sw/source xmloff/inc xmloff/source
offapi/com/sun/star/style/XStyle.idl |8 +++
offapi/type_reference/types.rdb |binary
reportdesign/source/core/api/ReportDefinition.cxx |3 +
sc/inc/styleuno.hxx |2
sc/source/ui/unoobj/styleuno.cxx | 17 ++
sd/inc/stlsheet.hxx |2
sd/source/core/stlsheet.cxx | 16 ++
svx/source/table/tabledesign.cxx |2
sw/inc/unostyle.hxx |2
sw/source/core/unocore/unostyle.cxx | 35 ++
sw/source/ui/app/docstyle.cxx | 55 ++
xmloff/inc/xmloff/xmlnume.hxx |2
xmloff/inc/xmloff/xmlstyle.hxx|3 +
xmloff/source/draw/sdpropls.cxx |2
xmloff/source/style/XMLPageExport.cxx |3 +
xmloff/source/style/prstylei.cxx |2
xmloff/source/style/styleexp.cxx |3 +
xmloff/source/style/xmlnume.cxx | 10 ++--
xmloff/source/style/xmlstyle.cxx |5 ++
xmloff/source/text/XMLTextListAutoStylePool.cxx |2
xmloff/source/text/txtstyli.cxx |2
21 files changed, 141 insertions(+), 35 deletions(-)
New commits:
commit a0dcf961879ab644a52f801f65466756cb144b72
Author: Cédric Bosdonnat
Date: Fri Nov 30 18:51:55 2012 +0100
Hidden styles: ODF import/export
Change-Id: I1138314eba33dc8cf8d1f60e77ac419b4550bbcc
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index cae4c50..c2228dc 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -523,39 +523,36 @@ sal_Bool SwDocStyleSheet::IsHidden( ) const
{
sal_Bool bRet = sal_False;
-if(!bPhysical)
+SwFmt* pFmt = 0;
+switch(nFamily)
{
-SwFmt* pFmt = 0;
-switch(nFamily)
-{
-case SFX_STYLE_FAMILY_CHAR:
-pFmt = rDoc.FindCharFmtByName( aName );
-bRet = pFmt && pFmt->IsHidden( );
-break;
+case SFX_STYLE_FAMILY_CHAR:
+pFmt = rDoc.FindCharFmtByName( aName );
+bRet = pFmt && pFmt->IsHidden( );
+break;
-case SFX_STYLE_FAMILY_PARA:
-pFmt = rDoc.FindTxtFmtCollByName( aName );
-bRet = pFmt && pFmt->IsHidden( );
-break;
+case SFX_STYLE_FAMILY_PARA:
+pFmt = rDoc.FindTxtFmtCollByName( aName );
+bRet = pFmt && pFmt->IsHidden( );
+break;
-case SFX_STYLE_FAMILY_FRAME:
-pFmt = rDoc.FindFrmFmtByName( aName );
-bRet = pFmt && pFmt->IsHidden( );
-break;
+case SFX_STYLE_FAMILY_FRAME:
+pFmt = rDoc.FindFrmFmtByName( aName );
+bRet = pFmt && pFmt->IsHidden( );
+break;
-case SFX_STYLE_FAMILY_PAGE:
-{
-SwPageDesc* pPgDesc = rDoc.FindPageDescByName( aName );
-bRet = pPgDesc && pPgDesc->IsHidden( );
-}
-break;
-case SFX_STYLE_FAMILY_PSEUDO:
-{
-SwNumRule* pRule = rDoc.FindNumRulePtr( aName );
-bRet = pRule && pRule->IsHidden( );
-}
-default:;
-}
+case SFX_STYLE_FAMILY_PAGE:
+{
+SwPageDesc* pPgDesc = rDoc.FindPageDescByName( aName );
+bRet = pPgDesc && pPgDesc->IsHidden( );
+}
+break;
+case SFX_STYLE_FAMILY_PSEUDO:
+{
+SwNumRule* pRule = rDoc.FindNumRulePtr( aName );
+bRet = pRule && pRule->IsHidden( );
+}
+default:;
}
return bRet;
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index e6406bd..dca651d 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
@@ -86,7 +86,7 @@ public:
XMLTextListAutoStylePool *pPool,
sal_Bool bExportChapterNumbering = sal_True );
void exportNumberingRule(
-const ::rtl::OUString& rName,
+const ::rtl::OUString& rName, sal_Bool bIsHidden,
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexReplace > & xNumRule );
};
diff --git a/xmloff/inc/xmloff/xmlstyle.hxx b/xmloff/inc/xmloff/xmlstyle.hxx
index 222ba26..8296b24 100644
--- a/xmloff/inc/xmloff/xmlstyle.hxx
+++ b/xmloff/inc/xmloff/xmlstyle.hxx
@@ -65,6 +65,7 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public
SvXMLImportContext
::rtl::OUString maAutoName;
::rtl::OUString maParentName;// Will be moved to XMLPropStyle soon
::rtl::OUString maFollow; // Will be moved to XMLPropStyle soon
+
Re: minutes of ESC call ...
Hello Petr, Le Fri, 30 Nov 2012 17:53:30 +0100, Petr Mladek a écrit: Mat M píše v Pá 30. 11. 2012 v 01:42 +0100: Le Thu, 29 Nov 2012 18:20:45 +0100, Lionel Elie Mamane a écrit: > On Thu, Nov 29, 2012 at 04:45:57PM +, Michael Meeks wrote: > >> * Release Engineering update (Petr) >>+ 4.0 timeline: Monday: feature-freeze ... >>+ please let Petr know if you're late > Well, as stated in [1], I could be either late or unstable, whichever you prefer First goal is to be on-time and /maybe/ unstable. Heh, shame on me, I do not know what feature you are working on :-) What You do not know what every LO contributor is currently working on ?! What a shame! :-D Well, actually, I put a nice [1] for reference, but not the link, so: https://bugs.freedesktop.org/show_bug.cgi?id=56902#c1 We want an usable beta1 so that people could test it. Hence, if your feature affects only limited functionality, do not be afraid to get it beta1 even when it has bugs. If it affects some core functionality and is there a risk that some bug could affect most users => break testing, I would prefer to leave it for beta2. If you leave it for beta2, please commit it as soon as possible and ask for testing on the libreoffice...@lists.freedesktop.org mailing list. They will be able to use daily builds and catch problems even before beta2. ok, will try ty -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/Configuration_filter.mk
filter/Configuration_filter.mk |5 - 1 file changed, 5 deletions(-) New commits: commit ebb4150463ef97571d8f4ffc0b8189ff94d5cf1a Author: Michael Stahl Date: Fri Nov 30 21:28:00 2012 +0100 filter: try to use the Python implementation of FCFGMerge ... seems to work here, and if nobody complains about broken filter configurations we can remove the Java FCFGMerge implementation. Change-Id: I0cf2de604bb9c34678174bdf951e70d499ea7df1 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index dd4a09d..f84058e 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -21,15 +21,10 @@ # most of the rules here use some weird merge program, and this is sort of # semi-integrated with the stuff from Configuration.mk; not exactly pretty... -ifeq ($(SOLAR_JAVA),) filter_MERGE_TARGET := $(gb_PYTHONTARGET) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(gb_PYTHON) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge -else # SOLAR_JAVA -filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar -filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET) -endif filter_MERGE_CONFIG_TARGET := $(OUTDIR_FOR_BUILD)/inc/l10ntools/FCFGMerge.cfg ### filter configuration rules: generic stuff ### ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fwd: solaris/smartos support planned?
Hi there, On Fri, 2012-11-30 at 16:05 +0100, Michael Stahl wrote: > On 30/11/12 15:51, Yaroslav Tarasenko wrote: > > are there any plans to have solaris port of libreoffice oficially > > supported? > > What is the opinion of developers on the topic? Is there a future > > for solaris/illumos port? > > if somebody steps up to do the work, sure why not... Of course; last we heard Lanedo was doing some of the work there - and got it at least running on Solaris/X86 using gcc (which should be the preferred route going forward). No doubt they'd give you some pointers if you wanted to help out with some hacking there - I believe their latest work was checked into master; if you want to contract them for support on that platform I'm sure they'd be interested too :-) I guess the trick is to start the build and send patches in. ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo##38838 UniString Removal in dbaccess
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1208 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/1208/1 fdo##38838 UniString Removal in dbaccess Change-Id: I6c4f8e9834fdd78851f5274ce2b141cfb49e6458 --- M dbaccess/source/ui/dlg/paramdialog.cxx M dbaccess/source/ui/dlg/sqlmessage.cxx M dbaccess/source/ui/inc/paramdialog.hxx M dbaccess/source/ui/inc/sqlmessage.hxx 4 files changed, 14 insertions(+), 14 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1208 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c4f8e9834fdd78851f5274ce2b141cfb49e6458 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source
desktop/source/splash/splash.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 0cdc6ea49f0b6d915bf11769991101019e5f7c18 Author: David Tardon Date: Fri Nov 30 21:03:32 2012 +0100 drop one more #include Change-Id: Ie01d49341ea1317153f4e57841a0a401a329140a diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 2c2ecd2..15f6771 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#38838 UniString -> OUString in cui
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1203 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1203 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16eae4aff2b946421df2b65ecfbd1d9b2e2256b6 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania Gerrit-Reviewer: Olivier Hallot Gerrit-Reviewer: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source
cui/source/tabpages/numpages.cxx | 10 +-
cui/source/tabpages/tpcolor.cxx |8
cui/source/tabpages/tpgradnt.cxx | 20 ++--
cui/source/tabpages/tphatch.cxx | 20 ++--
cui/source/tabpages/tpline.cxx | 12 ++--
cui/source/tabpages/tplnedef.cxx | 10 +-
cui/source/tabpages/tplneend.cxx |8
cui/source/tabpages/transfrm.cxx |2 +-
8 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit ae2e02261de0c77394f28c19f07153dcb43bc330
Author: Ricardo Montania
Date: Fri Nov 30 14:23:35 2012 -0200
fdo#38838 UniString -> OUString in cui
Change-Id: I16eae4aff2b946421df2b65ecfbd1d9b2e2256b6
Reviewed-on: https://gerrit.libreoffice.org/1203
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d81de7b..05efd95 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1283,7 +1283,7 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet&
rSet )
aLevelLB.InsertEntry( OUString::valueOf(i));
if(pSaveNum->GetLevelCount() > 1)
{
-String sEntry( OUString("1 - ") );
+OUString sEntry( "1 - " );
sEntry += OUString::valueOf( pSaveNum->GetLevelCount() );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
@@ -2504,7 +2504,7 @@ voidSvxNumberingPreview::Paint( const Rectangle&
/*rRect*/ )
else
{
//#i5153# painting gray or black rectangles as 'normal' numbering
text
-String sMsg( "Preview" );
+OUString sMsg( "Preview" );
long nWidth = pVDev->GetTextWidth(sMsg);
long nTextHeight = pVDev->GetTextHeight();
long nRectHeight = nTextHeight * 2 / 3;
@@ -2708,7 +2708,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window*
pParent,
Point aPos(250,0);
pDebugFixedText->SetPosSizePixel(aPos, aSize);
-pDebugFixedText->SetText( OUString("Das ist ein Debug-Text") );
+pDebugFixedText->SetText( "Das ist ein Debug-Text" );
#endif
aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
@@ -3047,8 +3047,8 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet
)
aLevelLB.InsertEntry( OUString::valueOf(i) );
if(pSaveNum->GetLevelCount() > 1)
{
-String sEntry( OUString("1 - ") );
-sEntry.Append( OUString::valueOf( pSaveNum->GetLevelCount() ) );
+OUString sEntry( "1 - " );
+sEntry += OUString::valueOf( pSaveNum->GetLevelCount() );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
}
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f8c3aff..6893994 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -131,7 +131,7 @@ void SvxLoadSaveEmbed::UpdateTableName()
{
// Truncate the name if necessary ...
String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+aString.AppendAscii( ": " );
XPropertyListRef pList = GetList();
if( !pList.is() )
@@ -143,7 +143,7 @@ void SvxLoadSaveEmbed::UpdateTableName()
if ( aURL.getBase().getLength() > 18 )
{
aString += String(aURL.getBase()).Copy( 0, 15 );
-aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "..." ) );
+aString.AppendAscii( "..." );
}
else
aString += String (aURL.getBase());
@@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
// handle CMYK-values (0..100%)
// and adjust MetricFields respectively
-String aStrUnit( RTL_CONSTASCII_USTRINGPARAM( " %" ) );
+String aStrUnit( " %" );
aMtrFldColorModel1.SetUnit(FUNIT_CUSTOM);
aMtrFldColorModel1.SetCustomUnitText( aStrUnit );
@@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl(
sal_uInt16 nPercent )
void SvxColorTabPage::FillUserData()
{
// the color model is saved in the Ini-file
-SetUserData( UniString::CreateFromInt32( eCM ) );
+SetUserData( OUString::valueOf( eCM ) );
}
//
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index a5a37a0..c8fcb05 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -195,7 +195,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
// determining (and possibly cutting) the name and
// displaying it in the GroupBox
-String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
+String aString( CUI_RES( RI
[Libreoffice-commits] .: desktop/source sal/qa vcl/generic vcl/source
desktop/source/app/langselect.cxx |1 -
sal/qa/rtl/locale/rtl_locale.cxx | 13 -
vcl/generic/fontmanager/fontconfig.cxx |1 -
vcl/source/app/brand.cxx |1 -
4 files changed, 16 deletions(-)
New commits:
commit f36aec428390eb7145a466e9773e04271038247d
Author: Michael Stahl
Date: Fri Nov 30 20:45:29 2012 +0100
eradicate all traces of OLocale and rtl/locale.hxx
... damn language tags breaking builds left and right ...
Change-Id: I73224cb3fb2bb98779fdcace700cad2a4fb7cd0e
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index 085e0a7..e254493 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -40,7 +40,6 @@
#include
#include
#include "com/sun/star/util/XFlushable.hpp"
-#include
#include
#include
#include
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 6607b76..5494a18 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -48,18 +48,6 @@ public:
{
}
-// insert your test code here.
-void getDefault_000()
-{
-// this is demonstration code
-// CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
-// due to the fact, we set the default locale at first, this test is
no longer possible
- // ::rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
-// CPPUNIT_ASSERT_MESSAGE("locale must be null", aLocale.getData() ==
NULL);
-
-}
-
void getDefault_001()
{
rtl_Locale* pData = rtl_locale_getDefault();
@@ -71,7 +59,6 @@ public:
// because these macros are need by auto register mechanism.
CPPUNIT_TEST_SUITE(getDefault);
-CPPUNIT_TEST(getDefault_000);
CPPUNIT_TEST(getDefault_001);
CPPUNIT_TEST_SUITE_END();
}; // class getDefault
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index 86c4ff5..b707b78 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -87,7 +87,6 @@ using namespace psp;
#include "osl/process.h"
#include "rtl/ustrbuf.hxx"
-#include "rtl/locale.hxx"
#include "sal/alloca.h"
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 74d5510..33b8bdd 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -19,7 +19,6 @@
#include
#include
-#include
#include
#include
#include
___
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 --- Comment #181 from Joel Madero --- 3.5 MAB are still being addressed, the procedure is that these bugs are highlighted for the developers but with the vast amount of bugs, enhancements, etc... being done all the time, some MAB get "brought over" to the new version (for instance some 3.5 bugs may come over to 3.6 bugs but that isn't happening yet). Furthermore, it is at the discretion of the developers which MAB comes first -- how old a bug is isn't the main criteria in most cases, it's really how annoying the bug is for the most amount of people coupled with what developer(s) know that part of the code enough to tackle the issue. The other issue is that some MAB are not in fact MAB and were put there without independent review (this is a requirement for MAB's amongst other requirements). These bugs may be taken off the MAB list at some point but our developers are working hard on fixing bugs that have already been independently verified to be a MAB for many users. Most of the times this means a major feature of LibO isn't working properly, and can often include crashes, memory leaks, etc If you want to get more involved with how policies are made and help us continue to make LibO better, please join us over at QA, we always welcome a fresh opinion. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38838 UniString -> OUString in cui
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1202 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1202 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b629cad4d9b6d4c086bfff47f1d3e9779b2c24d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania Gerrit-Reviewer: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source
cui/source/tabpages/numfmt.cxx |8 +++---
cui/source/tabpages/numpages.cxx | 51 +++
cui/source/tabpages/page.cxx |4 +--
cui/source/tabpages/tpbitmap.cxx | 22
4 files changed, 42 insertions(+), 43 deletions(-)
New commits:
commit 2cb8883cfd1c6ffe293497f064f90f76d12eff32
Author: Ricardo Montania
Date: Fri Nov 30 14:10:50 2012 -0200
fdo#38838 UniString -> OUString in cui
Change-Id: I9b629cad4d9b6d4c086bfff47f1d3e9779b2c24d
Reviewed-on: https://gerrit.libreoffice.org/1202
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 014f87b..7bd349b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1014,8 +1014,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool
bCheckCatChange /*= sa
aEdLeadZeroes.Enable();
aBtnNegRed.Enable();
aBtnThousand.Enable();
-aEdDecimals .SetText( UniString::CreateFromInt32( nDecimals ) );
-aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) );
+aEdDecimals .SetText( OUString::valueOf( nDecimals ) );
+aEdLeadZeroes.SetText( OUString::valueOf( nZeroes ) );
aBtnNegRed .Check( bNegRed );
aBtnThousand .Check( bThousand );
break;
@@ -1036,8 +1036,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool
bCheckCatChange /*= sa
aEdLeadZeroes .Disable();
aBtnNegRed .Disable();
aBtnThousand.Disable();
-aEdDecimals .SetText( UniString::CreateFromInt32( 0 ) );
-aEdLeadZeroes .SetText( UniString::CreateFromInt32( 0 ) );
+aEdDecimals .SetText( OUString::valueOf( 0 ) );
+aEdLeadZeroes .SetText( OUString::valueOf( 0 ) );
aBtnNegRed .Check( sal_False );
aBtnThousand.Check( sal_False );
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3747402..d81de7b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -78,7 +78,6 @@ using namespace com::sun::star::i18n;
using namespace com::sun::star::text;
using namespace com::sun::star::container;
using namespace com::sun::star::style;
-using rtl::OUString;
#define NUM_PAGETYPE_BULLET 0
#define NUM_PAGETYPE_SINGLENUM 1
@@ -170,7 +169,7 @@ static sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum,
sal_uInt16 nLevelMask)
static Font& lcl_GetDefaultBulletFont()
{
static sal_Bool bInit = 0;
-static Font aDefBulletFont( rtl::OUString("StarSymbol"),
+static Font aDefBulletFont( OUString("StarSymbol"),
String(), Size( 0, 14 ) );
if(!bInit)
{
@@ -504,8 +503,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
SvxNumberFormat aFmt(pActNum->GetLevel(i));
aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
// #i93908# clear suffix for bullet lists
-aFmt.SetPrefix(::rtl::OUString());
-aFmt.SetSuffix(::rtl::OUString());
+aFmt.SetPrefix( OUString() );
+aFmt.SetSuffix( OUString() );
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
aFmt.SetCharFmtName(sBulletCharFmtName);
@@ -716,8 +715,8 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL)
{
// #i93908# clear suffix for bullet lists
-aFmt.SetPrefix(::rtl::OUString());
-aFmt.SetSuffix(::rtl::OUString());
+aFmt.SetPrefix(OUString());
+aFmt.SetSuffix(OUString());
if( !pLevelSettings->sBulletFont.isEmpty() &&
pLevelSettings->sBulletFont.compareTo(
rActBulletFont.GetName()))
@@ -1281,11 +1280,11 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet&
rSet )
if(!aLevelLB.GetEntryCount())
{
for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
-aLevelLB.InsertEntry( UniString::CreateFromInt32(i));
+aLevelLB.InsertEntry( OUString::valueOf(i));
if(pSaveNum->GetLevelCount() > 1)
{
-String sEntry(rtl::OUString("1 - "));
-sEntry += UniString::CreateFromInt32( pSaveNum->GetLevelCount() );
+String sEntry( OUString("1 - ") );
+sEntry += OUString::valueOf( pSaveNum->GetLevelCount() );
aLevelLB.InsertEntry(sEntry);
aLevelLB.SelectEntry(sEntry);
}
@@ -2302,7 +2301,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
aBulletColor.Invert();
aFont.SetColor(aBulletColor);
pVDev->SetFont( aFont );
-rtl::OUS
[Libreoffice-commits] .: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sw/qa sw/source
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/text/DocumentSettings.idl|3
offapi/com/sun/star/text/PrintPreviewSettings.idl| 71
--
offapi/type_reference/types.rdb |binary
qadevOOo/Jar_OOoRunner.mk|1
qadevOOo/objdsc/sw/com.sun.star.comp.Writer.DocumentSettings.csv |9 -
qadevOOo/tests/java/ifc/text/_PrintPreviewSettings.java | 26 ---
sw/qa/unoapi/knownissues.xcl |3
sw/source/ui/uno/SwXDocumentSettings.cxx |3
9 files changed, 1 insertion(+), 116 deletions(-)
New commits:
commit aab4574d4b0b055385be8d9b2a752863ba8a1a64
Author: Michael Stahl
Date: Fri Nov 30 20:26:16 2012 +0100
API CHANGE: remove service com.sun.star.text.PrintPreviewSettings
This service was obsoleted by CWS printerpullpages: the implementation
in Writer was defunct in OpenOffice.org 3.3 and completely removed in
OpenOffice.org 3.4.
Change-Id: Ia4dd6f1f1d8fc399583032b44d99663532409b5c
EXISTENCE: published key "/UCR/com/sun/star/text/PrintPreviewSettings"
exists only in registry 1
SERVICE: /UCR/com/sun/star/text/DocumentSettings
service1 contains 1 more references as service2
incompatible change: Reference 2 ('PrintPreviewSettings') in 'r1' is not
longer a reference of this service in 'r2'
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index d156531..a16febe 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1265,7 +1265,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
PagePrintSettings \
Paragraph \
ParagraphEnumeration \
- PrintPreviewSettings \
PrintSettings \
RedlinePortion \
ReferenceMark \
diff --git a/offapi/com/sun/star/text/DocumentSettings.idl
b/offapi/com/sun/star/text/DocumentSettings.idl
index 3823973..0ba7929 100644
--- a/offapi/com/sun/star/text/DocumentSettings.idl
+++ b/offapi/com/sun/star/text/DocumentSettings.idl
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
module com { module sun { module star { module text {
@@ -36,8 +35,6 @@ published service DocumentSettings
[optional] service com::sun::star::text::PrintSettings;
-[optional] service com::sun::star::text::PrintPreviewSettings;
-
/** gives access to the properties implemented by this service.
*/
interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/text/PrintPreviewSettings.idl
b/offapi/com/sun/star/text/PrintPreviewSettings.idl
deleted file mode 100644
index cd3ebe3..000
--- a/offapi/com/sun/star/text/PrintPreviewSettings.idl
+++ /dev/null
@@ -1,71 +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 .
- */
-#ifndef __com_sun_star_text_PrintPreviewSettings_idl__
-#define __com_sun_star_text_PrintPreviewSettings_idl__
-
-#include
-
-
-
- module com { module sun { module star { module text {
-
-
-/** These properties describe the printing of the content of a text document.
- *
- * @deprecated since OOo 3.3
- */
-published service PrintPreviewSettings
-{
-/** All properties have the property attribute "maybevoid"
-meaning: if none of them have been set, they all will return a void value,
if any
-one of them has been set, then none of them will be void any longer */
-
-/** Size of the left margin */
-[property, maybevoid] long PreviewPrintLeftMargin;
-
-/** Size of the right margin */
-[property, maybevoid] long PreviewPrintRightMargin;
-
-/** Size of the top margin */
-[property, maybevoid] long PreviewPrintTopMargin;
-
-/** Size of the bottom margin */
-[property, maybevoid] long PreviewPrintBottomMargin;
-
-/** Size of the horizontal spacing */
-[property, maybevoid] long PreviewPrintHorizontalSpacing;
-
-[property, maybevoid] long PreviewPrintVerticalSpacing;
-
-/** Number of Rows */
-[property, maybevoid] byte PreviewPrintNum
[Libreoffice-commits] .: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk |2
offapi/com/sun/star/text/XHeaderFooter.idl | 57 ---
offapi/com/sun/star/text/XHeaderFooterPageStyle.idl | 58
offapi/type_reference/types.rdb |binary
4 files changed, 117 deletions(-)
New commits:
commit 4323fd8b7a766ab197a1f9a38594cacc51f4d017
Author: Michael Stahl
Date: Fri Nov 30 19:58:29 2012 +0100
API CHANGE: remove com.sun.star.text.XHeaderFooter/XHeaderFooterPageStyle
These interfaces have been deprecated since OpenOffice.org initial CVS
import.
EXISTENCE: published key "/UCR/com/sun/star/text/XHeaderFooter" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/text/XHeaderFooterPageStyle"
exists only in registry 1
Change-Id: Idd1bd6086b7bd892a3588750143635897486e9b0
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b9fd090..d156531 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3625,8 +3625,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
XFootnotesSettingsSupplier \
XFootnotesSupplier \
XFormField \
- XHeaderFooter \
- XHeaderFooterPageStyle \
XLineNumberingProperties \
XMailMergeBroadcaster \
XMailMergeListener \
diff --git a/offapi/com/sun/star/text/XHeaderFooter.idl
b/offapi/com/sun/star/text/XHeaderFooter.idl
deleted file mode 100644
index 935bc80..000
--- a/offapi/com/sun/star/text/XHeaderFooter.idl
+++ /dev/null
@@ -1,57 +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 .
- */
-#ifndef __com_sun_star_text_XHeaderFooter_idl__
-#define __com_sun_star_text_XHeaderFooter_idl__
-
-#include
-#include
-
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: interface com::sun::star::text::XHeaderFooter
-/** @deprecated Use the properties of
-PageProperties instead
- */
-published interface XHeaderFooter: com::sun::star::uno::XInterface
-{
-
-// DocMerge from idl: method
com::sun::star::text::XHeaderFooter::getLeftPagesText
-/** @returns
-the text interface for the header/footer text of a left page.
- */
-com::sun::star::text::XText getLeftPagesText();
-
-
-// DocMerge from idl: method
com::sun::star::text::XHeaderFooter::getRightPagesText
-/** @returns
-the text interface for the header/footer text of a right page.
- */
-com::sun::star::text::XText getRightPagesText();
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
b/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
deleted file mode 100644
index 654de15..000
--- a/offapi/com/sun/star/text/XHeaderFooterPageStyle.idl
+++ /dev/null
@@ -1,58 +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 .
- */
-#ifndef __com_sun_star_text_XHeaderFooterPageStyle_idl__
-#define __com_sun_star_text_XHeaderFooterPageStyle_idl__
-
-#include
-#include
-
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: interface com::sun::star::text::XHeaderFooterPageStyle
-/** @deprecat
[PATCH] WIP: move base check for bibliography to sfx2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1207 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/1207/1 WIP: move base check for bibliography to sfx2 - in the libbiblio component the frame is already created, and a frame that is loading is vetoing a terminate - thus move check to sfx2 - using the RestartManager call still causes crash though Change-Id: I500aaeac44d52969575f50f6b79d0c07a08c977e --- M extensions/source/bibliography/bibload.cxx M sfx2/source/appl/appserv.cxx 2 files changed, 66 insertions(+), 51 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1207 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I500aaeac44d52969575f50f6b79d0c07a08c977e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/text/GenericTextDocument.idl|3
offapi/com/sun/star/text/XLineNumberingSupplier.idl | 62
--
offapi/type_reference/types.rdb |binary
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv |2
qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java | 55
7 files changed, 124 deletions(-)
New commits:
commit 8674c120cf4eb0f180ec40044a060ef1b345e40c
Author: Michael Stahl
Date: Fri Nov 30 19:40:31 2012 +0100
API CHANGE: remove com.sun.star.text.XLineNumberingSupplier
This interface has been deprecated since OpenOffice.org initial CVS
import.
EXISTENCE: published key "/UCR/com/sun/star/text/XLineNumberingSupplier"
exists only in registry 1
SERVICE: /UCR/com/sun/star/text/GenericTextDocument
service1 contains 1 more references as service2
incompatible change: Reference 10 ('XLineNumberingSupplier') in
'r1' is not longer a reference of this service in 'r2'
Change-Id: I24ff18d0fe22d3caa893a7d5c766d352b7ca99c3
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 67a29e2..b9fd090 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3628,7 +3628,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
XHeaderFooter \
XHeaderFooterPageStyle \
XLineNumberingProperties \
- XLineNumberingSupplier \
XMailMergeBroadcaster \
XMailMergeListener \
XMultiTextMarkup \
diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl
b/offapi/com/sun/star/text/GenericTextDocument.idl
index 09e1886..9956b80 100644
--- a/offapi/com/sun/star/text/GenericTextDocument.idl
+++ b/offapi/com/sun/star/text/GenericTextDocument.idl
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -87,8 +86,6 @@ published service GenericTextDocument
[optional] interface com::sun::star::text::XReferenceMarksSupplier;
-[optional] interface com::sun::star::text::XLineNumberingSupplier;
-
[optional] interface com::sun::star::text::XChapterNumberingSupplier;
[optional] interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
deleted file mode 100644
index ae08741..000
--- a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
+++ /dev/null
@@ -1,62 +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 .
- */
-#ifndef __com_sun_star_text_XLineNumberingSupplier_idl__
-#define __com_sun_star_text_XLineNumberingSupplier_idl__
-
-#include
-
-#include
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: interface com::sun::star::text::XLineNumberingSupplier
-/** contains the settings of the line numbering in a text document.
-
-@deprecated
- */
-published interface XLineNumberingSupplier: com::sun::star::uno::XInterface
-{
-
-// DocMerge from idl: method
com::sun::star::text::XLineNumberingSupplier::getLineNumberingRules
-/** @return the LineNumberingSettings of the object.
- */
-sequence< sequence >
getLineNumberingRules();
-
-
-// DocMerge from xml: method
com::sun::star::text::XLineNumberingSupplier::setLineNumberingRules
-/** sets a sequence of numbering rules.
-
-
-
-The elements of the sequence are representing the chapter levels,
-index 0 for the major chapter level.
- */
-void setLineNumberingRules( [in] sequence<
sequence > aRules );
-
-};
-
-
-}; }; }; };
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 0cc9a60..dc13d62 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/types.rdb differ
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index c0481c1..9
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/misc/dp_misc.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 57045024d66e4ffbd04be3c646805aac3ef32deb
Author: Bjoern Michaelsen
Date: Fri Nov 30 01:22:55 2012 +0100
de-cargocult singleton creation
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index 68ff9b4..dcd8b53 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -36,7 +36,7 @@
#include "com/sun/star/bridge/UnoUrlResolver.hpp"
#include "com/sun/star/bridge/XUnoUrlResolver.hpp"
#include "com/sun/star/deployment/ExtensionManager.hpp"
-#include "com/sun/star/task/XRestartManager.hpp"
+#include "com/sun/star/task/OfficeRestartManager.hpp"
#include "boost/scoped_array.hpp"
#include "boost/shared_ptr.hpp"
#include
@@ -566,9 +566,7 @@ void syncRepositories(
if (bModified)
{
-Reference restarter(
-comphelper_getProcessComponentContext()->getValueByName(
-OUSTR( "/singletons/com.sun.star.task.OfficeRestartManager")
), UNO_QUERY );
+Reference
restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext()));
if (restarter.is())
{
OSL_TRACE( "Request restart for modified extensions manager" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: comphelper/source offapi/com offapi/type_reference offapi/UnoApi_offapi.mk sw/inc
comphelper/source/property/TypeGeneration.cxx |1
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/text/XModule.idl | 42 --
offapi/type_reference/types.rdb |binary
sw/inc/unomod.hxx |5 ---
5 files changed, 1 insertion(+), 48 deletions(-)
New commits:
commit 8231ae65cdcd587ee8982df72c7c45361a374127
Author: Michael Stahl
Date: Fri Nov 30 19:15:12 2012 +0100
API CHANGE: remove com.sun.star.text.XModule
This interface has been deprecated since OpenOffice.org initial CVS
import and the purpose of an empty interface is dubious anyway.
EXISTENCE: published key "/UCR/com/sun/star/text/XModule" exists only in
registry 1
Change-Id: If3c849d61d5433b8d426e2e89c3b818a7fff1e7d
diff --git a/comphelper/source/property/TypeGeneration.cxx
b/comphelper/source/property/TypeGeneration.cxx
index a6e8e17..1dd04e4 100644
--- a/comphelper/source/property/TypeGeneration.cxx
+++ b/comphelper/source/property/TypeGeneration.cxx
@@ -27,7 +27,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e0b42b3..67a29e2 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3631,7 +3631,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
XLineNumberingSupplier \
XMailMergeBroadcaster \
XMailMergeListener \
- XModule \
XMultiTextMarkup \
XNumberingFormatter \
XNumberingRulesSupplier \
diff --git a/offapi/com/sun/star/text/XModule.idl
b/offapi/com/sun/star/text/XModule.idl
deleted file mode 100644
index 575e543..000
--- a/offapi/com/sun/star/text/XModule.idl
+++ /dev/null
@@ -1,42 +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 .
- */
-#ifndef __com_sun_star_text_XModule_idl__
-#define __com_sun_star_text_XModule_idl__
-
-#include
-
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: interface com::sun::star::text::XModule
-/** @deprecated
- */
-published interface XModule: com::sun::star::uno::XInterface
-{
-};
-
-
-}; }; }; };
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index f4e72e5..0cc9a60 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/types.rdb differ
diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index 9bac96e..e807e22 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -19,7 +19,6 @@
#ifndef _UNOMOD_HXX
#define _UNOMOD_HXX
-#include
#include
#include
#include
@@ -27,7 +26,6 @@
#include
#include // helper for implementations
#include // helper for implementations
-#include // helper for implementations
#include
#include
#include
@@ -39,9 +37,8 @@ class SwDoc;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & );
-class SwXModule : public cppu::WeakImplHelper4
+class SwXModule : public cppu::WeakImplHelper3
<
-::com::sun::star::text::XModule,
::com::sun::star::view::XViewSettingsSupplier,
::com::sun::star::view::XPrintSettingsSupplier,
::com::sun::star::lang::XServiceInfo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo#38838 UniString -> OUString in dbaccess
Ricardo Montania has abandoned this change. Change subject: fdo#38838 UniString -> OUString in dbaccess .. Patch Set 1: Abandoned Need of change previous patch. -- To view, visit https://gerrit.libreoffice.org/1206 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ief7e1faf605ca80555f752bd875db56f47e36ad6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #180 from Steve Kelem --- Sorry to overwhelm you. I happened across the MAB for the first time and thought "What a great way to get some old issues resolved and some long-standing ones that I need to generate a test case for, else no one would believe me!" So, I spent time to create test cases for the bugs that are annoying because they're keeping me from being productive. By the way, I saw some of the entries here removing bugs from 3.6.x MAB because they are in the 3.5.x MAB. If 3.5.x is "old" and an annoying bug for 3.5 is still a problem in 3.6, what's the procedure for making sure the outstanding bugs, especially the MABs, are still addressed? -- 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] .: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/tests sw/source
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/text/XTextEmbeddedObject.idl | 62 -
offapi/type_reference/types.rdb|binary
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java | 51 -
qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java |1
sw/source/ui/frmdlg/cption.cxx |1
7 files changed, 117 deletions(-)
New commits:
commit 7a8d933585f5165393a9357edc55606c54cb36eb
Author: Michael Stahl
Date: Fri Nov 30 18:56:44 2012 +0100
API CHANGE: remove com.sun.star.text.XTextEmbeddedObject
This interface was apparently never implemented in OpenOffice.org.
EXISTENCE: published key "/UCR/com/sun/star/text/XTextEmbeddedObject"
exists only in registry 1
Change-Id: Ib802fa3f035d1842c9ee8018ef15f35a4680fe2b
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 608bfa0..e0b42b3 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3657,7 +3657,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
XTextCopy \
XTextCursor \
XTextDocument \
- XTextEmbeddedObject \
XTextEmbeddedObjectsSupplier \
XTextField \
XTextFieldsSupplier \
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
deleted file mode 100644
index 1f1097a..000
--- a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
+++ /dev/null
@@ -1,62 +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 .
- */
-#ifndef __com_sun_star_text_XTextEmbeddedObject_idl__
-#define __com_sun_star_text_XTextEmbeddedObject_idl__
-
-#include
-
-#include
-
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: interface com::sun::star::text::XTextEmbeddedObject
-/** f t!
-
-
-
-
-
-@deprecated
- */
-published interface XTextEmbeddedObject: com::sun::star::text::XTextContent
-{
-
-// DocMerge from idl: method
com::sun::star::text::XTextEmbeddedObject::getObject
-/** @returns an interface to the linked object that is contained in
-the TextEmbeddedObject.
- */
-com::sun::star::uno::XInterface getObject();
-
-
-// DocMerge from xml: method
com::sun::star::text::XTextEmbeddedObject::setObject
-/** sets an object into the TextEmbeddedObject.
- */
-void setObject( [in] com::sun::star::uno::XInterface xObject );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index db615c6..f4e72e5 100644
Binary files a/offapi/type_reference/types.rdb and
b/offapi/type_reference/types.rdb differ
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index eac1785..c0481c1 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -866,7 +866,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/text/_XTextContent \
qadevOOo/tests/java/ifc/text/_XTextCursor \
qadevOOo/tests/java/ifc/text/_XTextDocument \
-qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject \
qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier \
qadevOOo/tests/java/ifc/text/_XTextField \
qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier \
diff --git a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java
b/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java
deleted file mode 100644
index 43cf0fc..000
--- a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under
Re: [API] Some more cleanup ideas
On Friday 30 of November 2012, Stephan Bergmann wrote: > On 11/29/2012 06:42 PM, Thorsten Behrens wrote: > > With SAL_THROW & exception specs on api headers removed, there's a > > very nice & substantial cleanup task possible subsequently, that > > removes it from all implementation methods, too. > > I'm not sure this is a good move. > > To be able to programmatically react to an exception raised by a UNO > method (which is the raison d'être of non-runtime UNO exceptions), the > specification of that method must document the method's behavior with > respect to raising that exception, and any implementation of the method > must adhere to that specification. However, with that part of a UNO > method's interface moved out of sight of a programmer writing a C++ > implementation of that method, I fear that adherence to specification > will degrade in practice. And that negatively affects an area where we > do not shine anyway: reaction to errors. (Which is arguably a tricky > area to begin with, but so would probably benefit more from increasing > awareness and tooling than from reducing them.) > > There is indeed a trend in C++ to move away from dynamic exception > specifications, but I see none of the problems that motivated that trend > affecting us in this specific case. ... > Which leaves us with the benefit of shorter, less visually cluttered > declarations of C++ functions. But, as I argue above, I am not sure > that is an overall benefit at all. It's been pointed out to me that I'm written as the one to do this change in the LibreOffice4 wiki page. Which was a bit of a surprise to me, given that I don't feel very strongly one way or another (the only thing I felt strongly about a while back was that I didn't want Clang to be the only compiler where the exception specifications actually did anything). Digging in the wiki history, it was Thorsten who added the items related to exception specifications removal, and the link to the C++ article is from Bjoern. I did move the item to the list of things that actually will be done and added my name to it while doing so; my memory is a bit hazy on it, but I think I somehow mistakenly assumed the item was agreed upon and it probably felt like a good thing to try the Clang plugins on. Well, or at least that's the best explanation I can come up with now, I don't remember. That said, from what I can tell, Stephan is correct on the technical details. The problems seen with exception specifications, such as making the app fall flat on its face in case of a problem or being troublesome with templates, are of little or no concern in dbgutil build. In product builds it can be turned off for GCC, MSVC up to at least 2010 doesn't seem to give a damn, and Clang is probably no big deal to handle somehow if seen worth the effort. So, in practice, the specifications in our case are like writting out asserts in the code, and the only questions that there should be are whether it makes sense to have such asserts and whether they are worth the code clutter. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/Configuration_filter.mk filter/CustomTarget_svg.mk
filter/Configuration_filter.mk |6 -- filter/CustomTarget_svg.mk |1 + 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 3e0d7e60bc00b36cca0755a6b02879e0a1cc2484 Author: Michael Stahl Date: Fri Nov 30 18:19:47 2012 +0100 filter: add missing dependencies on python Change-Id: Ibaf38ad8000f7c4276aed91250c4bff1c78dd091 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 5b41bda..dd4a09d 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -22,8 +22,10 @@ # semi-integrated with the stuff from Configuration.mk; not exactly pretty... ifeq ($(SOLAR_JAVA),) -filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge -filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET) +filter_MERGE_TARGET := $(gb_PYTHONTARGET) \ + $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge +filter_MERGE := $(gb_PYTHON) \ + $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge else # SOLAR_JAVA filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET) diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index f20b5c1..1b374ff 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -59,6 +59,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) > $(filter_GEN_svg_Tokens_cxx)) $(filter_GEN_svg_Script_hxx) : \ + $(gb_PYTHONTARGET) \ $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \ | $(filter_SVGWORK)/.dir $(call gb_Output_announce,$@,build,PY ,1) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/uiconfig
cui/uiconfig/ui/select_persona_dialog.ui | 91 --- 1 file changed, 49 insertions(+), 42 deletions(-) New commits: commit 47f73da0dd4bc94856a50bfd8b666a979e851326 Author: Jan Holesovsky Date: Fri Nov 30 18:18:33 2012 +0100 Personas: Tweak the Select Persona dialog to be nicer. Change-Id: I0f45b3fd62ecff947d5ed82ec32bfbf5ac3211cd diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 123dd35..e704974 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -85,7 +85,8 @@ True False 0 -First visit Firefox Personas (http://www.getpersonas.com) and find Persona you like, and want to choose for LibreOffice. +First visit Firefox Personas (http://www.getpersonas.com). +Find Persona you like, and want to choose for LibreOffice. True 54 @@ -96,19 +97,35 @@ - -Visit Firefox Personas -False + True -True -True -center -center -False +False +True + + + + + +Visit Firefox Personas +False +True +True +True + + +False +False +1 + + + + + -False +True True +10 1 @@ -117,7 +134,7 @@ True False 0 -Then copy the URL of page that contains the Persona to clipboard, and paste it to the input field below, and confirm with OK. +Then copy the URL of page that contains the Persona to clipboard, paste it to the input field below, and confirm with OK. True 54 @@ -128,43 +145,33 @@ - + True False -6 - - -True -False -0 -Persona URL: - - -False -False -0 - - - - -True -True -â -True -False -False - - -True -True -1 - - +0 +Persona URL: + + +False +False +3 + + + + +True +True +â +True +False +False +True +True True True -3 +4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#38838 UniString -> OUString in dbaccess
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1206 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/1206/1 fdo#38838 UniString -> OUString in dbaccess Change-Id: Ief7e1faf605ca80555f752bd875db56f47e36ad6 --- M dbaccess/source/ui/dlg/paramdialog.cxx M dbaccess/source/ui/dlg/sqlmessage.cxx M dbaccess/source/ui/inc/paramdialog.hxx M dbaccess/source/ui/inc/sqlmessage.hxx 4 files changed, 14 insertions(+), 14 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1206 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ief7e1faf605ca80555f752bd875db56f47e36ad6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove rtl:: from a test in test/
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1205 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1205 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I151dc2e733c6c3a56d316b931934ff80aa076580 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Markus Mohrhard ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: test/source
test/source/sheet/xcellrangesquery.cxx | 42 -
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 36b7794d832dbc87c250ef02eee643c4ce68f87a
Author: Marcos Paulo de Souza
Date: Fri Nov 30 14:56:19 2012 -0200
Remove rtl:: from a test in test/
Change-Id: I151dc2e733c6c3a56d316b931934ff80aa076580
Signed-off-by: Marcos Paulo de Souza
Reviewed-on: https://gerrit.libreoffice.org/1205
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/test/source/sheet/xcellrangesquery.cxx
b/test/source/sheet/xcellrangesquery.cxx
index c2d1a07..374e550 100644
--- a/test/source/sheet/xcellrangesquery.cxx
+++ b/test/source/sheet/xcellrangesquery.cxx
@@ -43,71 +43,71 @@ namespace apitest {
void XCellRangesQuery::testQueryColumnDifference()
{
-rtl::OUString
aExpected(RTL_CONSTASCII_USTRINGPARAM("Sheet1.B1:C1,Sheet1.B3:C5"));
+OUString aExpected( "Sheet1.B1:C1,Sheet1.B3:C5" );
uno::Reference
xCellRangesQuery(init(),UNO_QUERY_THROW);
uno::Reference xRanges =
xCellRangesQuery->queryColumnDifferences(table::CellAddress(0, 1, 1));
-rtl::OUString aResult = xRanges->getRangeAddressesAsString();
-std::cout << "testQueryColumnDifference: Result: " <<
rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+OUString aResult = xRanges->getRangeAddressesAsString();
+std::cout << "testQueryColumnDifference: Result: " <<
OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryColumnDifference", aResult,
aExpected);
}
void XCellRangesQuery::testQueryContentDifference()
{
-rtl::OUString aExpected(RTL_CONSTASCII_USTRINGPARAM("Sheet1.B2:B3"));
+OUString aExpected( "Sheet1.B2:B3" );
uno::Reference
xCellRangesQuery(init(),UNO_QUERY_THROW);
uno::Reference xRanges =
xCellRangesQuery->queryContentCells(sheet::CellFlags::VALUE);
-rtl::OUString aResult = xRanges->getRangeAddressesAsString();
-std::cout << "testQueryContentDifference: Result: " <<
rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+OUString aResult = xRanges->getRangeAddressesAsString();
+std::cout << "testQueryContentDifference: Result: " <<
OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryContentDifference", aResult,
aExpected);
}
void XCellRangesQuery::testQueryEmptyCells()
{
-rtl::OUString
aExpected(RTL_CONSTASCII_USTRINGPARAM("Sheet1.A1:A5,Sheet1.B1:C1,Sheet1.B5,Sheet1.C3:C5,Sheet1.D1:D5"));
+OUString aExpected(
"Sheet1.A1:A5,Sheet1.B1:C1,Sheet1.B5,Sheet1.C3:C5,Sheet1.D1:D5" );
uno::Reference
xCellRangesQuery(init(),UNO_QUERY_THROW);
uno::Reference xRanges =
xCellRangesQuery->queryEmptyCells();
-rtl::OUString aResult = xRanges->getRangeAddressesAsString();
-std::cout << "testQueryEmptyCells: Result: " <<
rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+OUString aResult = xRanges->getRangeAddressesAsString();
+std::cout << "testQueryEmptyCells: Result: " << OUStringToOString(aResult,
RTL_TEXTENCODING_UTF8).getStr() << std::endl;
CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryEmptyCells", aResult, aExpected);
}
void XCellRangesQuery::testQueryFormulaCells()
{
-rtl::OUString aExpected(RTL_CONSTASCII_USTRINGPARAM("Sheet1.C2"));
+OUString aExpected( "Sheet1.C2" );
uno::Reference
xCellRangesQuery(init(),UNO_QUERY_THROW);
uno::Reference xRanges =
xCellRangesQuery->queryFormulaCells(sheet::CellFlags::FORMULA);
-rtl::OUString aResult = xRanges->getRangeAddressesAsString();
-std::cout << "testQueryFormulaCells: Result: " <<
rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+OUString aResult = xRanges->getRangeAddressesAsString();
+std::cout << "testQueryFormulaCells: Result: " <<
OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryFormulaCells", aResult, aExpected);
}
void XCellRangesQuery::testQueryIntersection()
{
-rtl::OUString aExpected(RTL_CONSTASCII_USTRINGPARAM("Sheet1.D4:D5"));
+OUString aExpected( "Sheet1.D4:D5" );
uno::Reference
xCellRangesQuery(init(),UNO_QUERY_THROW);
uno::Reference xRanges =
xCellRangesQuery->queryIntersection(table::CellRangeAddress(0,3,3,7,7));
-rtl::OUString aResult = xRanges->getRangeAddressesAsString();
-std::cout << "testQueryIntersection: Result: " <<
rtl::OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
+OUString aResult = xRanges->getRangeAddressesAsString();
+std::cout << "testQueryIntersection: Result: " <<
OUStringToOString(aResult, RTL_TEXTENCODING_UTF8).getStr() << std::endl;
CPPUNIT_ASSERT_EQUAL_MESSAGE("testQueryIntersection", aResult, aExpected);
}
void XCellRangesQuery::testQueryRowDifference()
{
-r
[PATCH] Remove rtl:: from a test in test/
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1205 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/1205/1 Remove rtl:: from a test in test/ Change-Id: I151dc2e733c6c3a56d316b931934ff80aa076580 Signed-off-by: Marcos Paulo de Souza --- M test/source/sheet/xcellrangesquery.cxx 1 file changed, 21 insertions(+), 21 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1205 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I151dc2e733c6c3a56d316b931934ff80aa076580 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Removed useless method from languagetag
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1204 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1204 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I683c54ed278d5a6ba12eaefb8040c3753a24f119 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Paula Mannes Gerrit-Reviewer: Olivier Hallot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/source unusedcode.easy
i18npool/source/languagetag/languagetag.cxx | 10 --
unusedcode.easy |1 -
2 files changed, 11 deletions(-)
New commits:
commit a14cc2331855c919761121c3ff234387921413ac
Author: Paula Mannes
Date: Fri Nov 30 14:12:33 2012 -0200
Removed useless method from languagetag
Change-Id: I683c54ed278d5a6ba12eaefb8040c3753a24f119
Signed-off-by: Paula Mannes
Reviewed-on: https://gerrit.libreoffice.org/1204
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index fc5b058..94cf2e1 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -70,7 +70,6 @@ public:
if (mnRef != SAL_MAX_UINT32 && mnRef && !--mnRef)
teardown();
}
-void presetDataPath( const rtl::OUString& rPath );
private:
rtl::OString maDataPath; // path to liblangtag data, "|" if system
sal_uInt32 mnRef;
@@ -112,15 +111,6 @@ void LiblantagDataRef::teardown()
lt_db_finalize();
}
-void LiblantagDataRef::presetDataPath( const rtl::OUString& rPath )
-{
-if (maDataPath.isEmpty())
-{
-maDataPath = OUStringToOString( rPath, RTL_TEXTENCODING_UTF8);
-lt_db_set_datadir( maDataPath.getStr());
-}
-}
-
void LiblantagDataRef::setupDataPath()
{
// maDataPath is assumed to be empty here.
diff --git a/unusedcode.easy b/unusedcode.easy
index a3e78d5..fa6e588 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,6 +1,5 @@
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&,
float, int, bool)
GraphicObject::SwapIn(SvStream*)
-LiblantagDataRef::presetDataPath(rtl::OUString const&)
Line::GetLength() const
Line::Intersection(Rectangle const&, Line&) const
PoHeader::getLanguage() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Michael Meeks píše v Pá 30. 11. 2012 v 10:14 +: > Hi Lionel, > > On Thu, 2012-11-29 at 18:20 +0100, Lionel Elie Mamane wrote: > > On Thu, Nov 29, 2012 at 04:45:57PM +, Michael Meeks wrote: > > > > > * Release Engineering update (Petr) > > > + 4.0 timeline: Monday: feature-freeze ... > > > + please let Petr know if you're late > > > > I'm late on the fix for fdo#53281 (*biiig* performance problem in Base > > created by the fix to fdo#47520).. Worked on it during HackFest, but > > did not finish :-( > > One can see it as a bugfix, but "big" changes that may create a > > cascade of bugs :-| FWIIW, I wouldn't want to backport this to 3.6. > > Sure - IMHO fixing that performance issues is really key, and its > something I'd really want to see in 4.0 - as early as possible to help > with testing of course. Thanks for all your great work there. I think that we all want it in 4.0 in the end. My suggestion is to do some basic testing. If it "almost" completely breaks Base on Monday, leave it for beta2. It it somehow works, commit it for beta1, so it get's more testing. How does that sound? Anyway, thanks a lot for working on it. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License
All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Paula Mannes ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
Mat M píše v Pá 30. 11. 2012 v 01:42 +0100: > Le Thu, 29 Nov 2012 18:20:45 +0100, Lionel Elie Mamane > a écrit: > > > On Thu, Nov 29, 2012 at 04:45:57PM +, Michael Meeks wrote: > > > >> * Release Engineering update (Petr) > >>+ 4.0 timeline: Monday: feature-freeze ... > >>+ please let Petr know if you're late > > > > Well, as stated in [1], I could be either late or unstable, whichever you > prefer > First goal is to be on-time and /maybe/ unstable. Heh, shame on me, I do not know what feature you are working on :-) We want an usable beta1 so that people could test it. Hence, if your feature affects only limited functionality, do not be afraid to get it beta1 even when it has bugs. If it affects some core functionality and is there a risk that some bug could affect most users => break testing, I would prefer to leave it for beta2. If you leave it for beta2, please commit it as soon as possible and ask for testing on the libreoffice...@lists.freedesktop.org mailing list. They will be able to use daily builds and catch problems even before beta2. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - vcl/generic vcl/source
vcl/generic/fontmanager/fontconfig.cxx |3 ++- vcl/source/window/builder.cxx |4 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 9f5ef935986cdf84189cbe2a7a0b0e90de0c3b1c Author: Caolán McNamara Date: Fri Nov 30 16:52:31 2012 + warn if an explicit requested top level widget name wasn't found Change-Id: I8e06bd91e5a20fc0d007aa5f7d1e01bd0ead86ab diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index ab4a6e7..0d8068b 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -238,6 +238,10 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri //drop maps, etc. that we don't need again delete m_pParserState; + +SAL_WARN_IF(!m_sID.isEmpty() && !get_by_name(m_sID), "vcl.layout", +"Requested top level widget \"" << m_sID.getStr() << +"\" not found in " << sUIFile); } VclBuilder::~VclBuilder() commit 247c460449176349e66676efd59a6cd2655a652e Author: Caolán McNamara Date: Fri Nov 30 16:51:53 2012 + fix build for me Change-Id: Ic29ff474101c88fbc428d229871659d99dd92d05 diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index f5fe7d8..86c4ff5 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -382,7 +382,8 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar //possible to-do, sort by UILocale instead of process locale rtl_Locale* pLoc = NULL; osl_getProcessLocale(&pLoc); -localizedsorter aSorter( *pLoc); +LanguageTag aTag(*pLoc); +localizedsorter aSorter(aTag); *element = aSorter.bestname(lang_and_elements); //if this element is a fontname, map the other names to this best-name ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Removed useless method from languagetag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1204 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/1204/1 Removed useless method from languagetag Change-Id: I683c54ed278d5a6ba12eaefb8040c3753a24f119 Signed-off-by: Paula Mannes --- M i18npool/source/languagetag/languagetag.cxx M unusedcode.easy 2 files changed, 0 insertions(+), 11 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1204 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I683c54ed278d5a6ba12eaefb8040c3753a24f119 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Paula Mannes ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/odma/odma_resultset.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0eaa504b49114becc571dd1887d6b93e3b364666
Author: Stephan Bergmann
Date: Fri Nov 30 17:48:34 2012 +0100
One more blind Windows-only ucp/odma fix attempt
Change-Id: I7b0e2eaba06b77fa7f71c66f25839c8de6c61c71
diff --git a/ucb/source/ucp/odma/odma_resultset.cxx
b/ucb/source/ucp/odma/odma_resultset.cxx
index 6d83a18..27f2c2b 100644
--- a/ucb/source/ucp/odma/odma_resultset.cxx
+++ b/ucb/source/ucp/odma/odma_resultset.cxx
@@ -80,9 +80,9 @@ void DynamicResultSet::initStatic()
void DynamicResultSet::initDynamic()
{
m_xResultSet1
-= new ::ucbhelper::ResultSet( comphelper::getComponentContext(m_xSMgr),
+= new ::ucbhelper::ResultSet( m_xContext,
m_aCommand.Properties,
- new DataSupplier( m_xSMgr,
+ new DataSupplier(
Reference(m_xContext->getServiceManager(),
UNO_QUERY_THROW),
m_xContent,
m_aCommand.Mode ),
m_xEnv );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/rtf/swparrtf.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit ed654c4aa7f9f10fcb16127349009bc0c38b12e8
Author: Miklos Vajna
Date: Fri Nov 30 17:37:08 2012 +0100
Revert "fdo#43869 use the old rtf importer for paste"
This reverts commit bb147bbb801b53dba8928340df7e2aa2d4545349. It's no
longer needed, now the new importer supports importing to an existing
document.
diff --git a/sw/source/filter/rtf/swparrtf.cxx
b/sw/source/filter/rtf/swparrtf.cxx
index 8f5a554..13216ca 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -26,7 +26,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -223,11 +222,6 @@ sal_uLong SwRTFReader::Read( SwDoc &rDoc, const String&
/*rBaseURL*/, SwPaM& rPa
extern "C" SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF()
{
-// Use the old rtf importer by default for paste, till the new one supports
-// undo stack and PaM.
-SvtMiscOptions aMiscOptions;
-if (!aMiscOptions.IsExperimentalMode())
-return new RtfReader();
return new SwRTFReader();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - cui/uiconfig offapi/com offapi/type_reference offapi/UnoApi_offapi.mk
cui/uiconfig/ui/select_persona_dialog.ui | 121 ++-- offapi/UnoApi_offapi.mk |2 offapi/com/sun/star/text/AdvancedTextDocument.idl | 128 -- offapi/com/sun/star/text/HypertextDocument.idl| 64 --- offapi/type_reference/types.rdb |binary 5 files changed, 63 insertions(+), 252 deletions(-) New commits: commit 1b7d7f8e2f78de0b685ea6b43e4379ff067d9097 Author: Caolán McNamara Date: Fri Nov 30 16:39:16 2012 + tweak dialog to have a default button and fix up for current glade behaviour Change-Id: I23b314890d8842bd368af69fa8bd2bcf71e592dd diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index ed3c2a6..123dd35 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -9,21 +9,8 @@ True False +vertical 2 - - -True -False -0 -First visit Firefox Personas (http://www.getpersonas.com) and find Persona you like, and want to choose for LibreOffice. -True - - -True -True -0 - - True @@ -35,6 +22,8 @@ False True True +True +True True False True @@ -86,11 +75,25 @@ - + True False +vertical +12 - + +True +False +0 +First visit Firefox Personas (http://www.getpersonas.com) and find Persona you like, and want to choose for LibreOffice. +True +54 + + +False +True +0 + @@ -99,74 +102,76 @@ True True True +center +center False False -False +True 1 - - - - -True -True -2 - - - - -True -False -0 -Then copy the URL of page that contains the Persona to clipboard, and paste it to the input field below, and confirm with OK. -True - - -True -True -4 - - - - -True -False - - + True False 0 -Persona URL: +Then copy the URL of page that contains the Persona to clipboard, and paste it to the input field below, and confirm with OK. +True +54 -False -False -0 +True +True +2 - + True -True -â -False -False +False +6 + + +True +False +0 +Persona URL: + + +False +False +0 + + + + +True +True +â +True +False +False + + +True +True +1 + + True True -1 +3 -True +False True -5 +1 commit c581cb503c9f99cdd0079c120f4f143f4bfddd39 Author: Michael Stahl Date: Fri Nov 30 17:13:08 2012 +0100 API CHANGE: remove com.sun.star.text.HypertextDocument ... and derived com.sun.star.text.AdvancedTextDocument services, which are deprecated since 2001 and actually unimplemented. EXISTENCE: published key "/UCR/com/sun/star/text/Hyper
Re: Desarrollar extensiones para Libre Office
Yamilka Leyva Coss wrote: > Hello, my name is Yamilka Leyva, am student at the University of > Informatics Sciences UCI, belong in a group of developing new > features for Libre Office, right now I want to develop new > functionalities for it, I need all the documentation possible > which can understand the process of creation of the above, > specifically how to make them, this is a job that I particularly > am going to start from scratch, but I am very interested. > Heya Yamilka, if you want to hack on the core LibreOffice - here's your starting point: http://www.libreoffice.org/developers-2/ (first thing to do is of course to get a build going, and you'll need some c++ knowledge) If, instead, you're rather interested in developing extensions, there's quite a variety of languages to implement them in, once you tell us which one you'd prefer, we can give you a number of pointers. With kind regards, -- Thorsten pgpPFXsQHsUXD.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: random number generators for calc
On 30/11/12 17:07, tino wrote: > I've had a look at what Gnumeric offers, and they've done a big job on > random number generation. Comparing with what is available in boost > I've separated the list into rand functions which could be quickly > implemented using boost and those which can't (and would require more > intelligence to implement). Another problem might be that boost 1.44 > which is currently used in libreoffice has even fewer distribution > functions implemented. if newer versions of boost have desirable features then upgrading that is always an option, but that needs a lot of testing because of the wide variety of different compilers and versions thereof that are currently supposed to be able to build LO, and boosts tendency to use every obscure C++ feature... > If there's interest, I'd be happy to work on a patch to implement the > first half of the functions into > core/sal/rtl/source/math.cxx > or maybe random.cxx? However, random.* seems not that well > maintained as there's no random.hxx. the header is sal/inc/rtl/random.h (which is apparently a C interface). but why do we need a wrapper around boost in sal? i mean i haven't looked at the boost random stuff but unless its interface is horrible (always a possibility with boost i guess) _and_ there are multiple places where we'd want to call it, then why not use it directly from Calc's formula implementation? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 694a2c53810dec6d8e069d74baf51e6cdda91faa Author: László Németh Date: Fri Nov 30 17:29:41 2012 +0100 Updated core Project: dictionaries 8be323a6b7496003419e2587bc4573949fe142dc Python 3 port of Lightproof en/hu modules diff --git a/dictionaries b/dictionaries index afc12cc..8be323a 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit afc12cc53bf96f765b4513868d3b7530c66711f1 +Subproject commit 8be323a6b7496003419e2587bc4573949fe142dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/uiconfig
cui/uiconfig/ui/select_persona_dialog.ui | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) New commits: commit 8eb4867806ac5d245e7cecaffbc0c026b2cf9d0d Author: Caolán McNamara Date: Fri Nov 30 16:28:53 2012 + set expected dialog name Change-Id: I6d9e91461389f3bb57dee194d36645f79321f2a0 diff --git a/cui/uiconfig/ui/select_persona_dialog.ui b/cui/uiconfig/ui/select_persona_dialog.ui index 5715e67..ed3c2a6 100644 --- a/cui/uiconfig/ui/select_persona_dialog.ui +++ b/cui/uiconfig/ui/select_persona_dialog.ui @@ -1,13 +1,12 @@ - - - + + False 5 dialog - + True False 2 @@ -26,7 +25,7 @@ - + True False end @@ -37,6 +36,7 @@ True True True +False True @@ -52,6 +52,7 @@ True True True +False True @@ -67,6 +68,7 @@ True True True +False True @@ -97,6 +99,7 @@ True True True +False False @@ -152,8 +155,6 @@ â False False -True -True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - i18npool/inc i18npool/source sal/inc sal/Package_inc.mk sal/qa vcl/generic vcl/source
i18npool/inc/i18npool/languagetag.hxx |8
i18npool/source/languagetag/languagetag.cxx | 22 ++
sal/Package_inc.mk |1
sal/inc/rtl/locale.hxx | 250
sal/qa/rtl/locale/rtl_locale.cxx| 60 +++---
sal/qa/rtl_strings/rtl_old_testowstring.cxx |2
vcl/generic/fontmanager/fontconfig.cxx |8
vcl/source/app/brand.cxx| 14 -
8 files changed, 70 insertions(+), 295 deletions(-)
New commits:
commit 73bda5058bcef6be9a3185aa46375c7b147ffa22
Author: Eike Rathke
Date: Fri Nov 30 17:26:32 2012 +0100
ditched rtl::OLocale
Change-Id: I3f4a09c82df1bc71759331705c502320f973d4bb
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index fa4246d..dff0229 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -77,7 +77,6 @@ $(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/crc.h,rtl/crc.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/digest.h,rtl/digest.h))
$(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/instance.hxx,rtl/instance.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/locale.h,rtl/locale.h))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/locale.hxx,rtl/locale.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.h,rtl/logfile.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/logfile.hxx,rtl/logfile.hxx))
$(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/malformeduriexception.hxx))
diff --git a/sal/inc/rtl/locale.hxx b/sal/inc/rtl/locale.hxx
deleted file mode 100644
index 9fb4960..000
--- a/sal/inc/rtl/locale.hxx
+++ /dev/null
@@ -1,250 +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 .
- */
-
-#ifndef _RTL_LOCALE_HXX_
-#define _RTL_LOCALE_HXX_
-
-#include
-#include
-
-#ifdef __cplusplus
-
-namespace rtl
-{
-
-/**
-A OLocale object represents a specific geographical,
political,
-or cultural region. An operation that requires a OLocale to
perform
-its task is called locale-sensitive and uses the
OLocale
-to tailor information for the user. For example, displaying a number
-is a locale-sensitive operation--the number should be formatted
-according to the customs/conventions of the user's native country,
-region, or culture.
-
-
-You create a OLocale object using one of the two constructors
in
-this class:
-
-
-OLocale(String language, String country)
-OLocale(String language, String country, String variant)
-
-
-The first argument to both constructors is a valid ISO
-Language Code. These codes are the lower-case two-letter
-codes as defined by ISO-639.
-You can find a full list of these codes at a number of sites, such as:
-http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt";>
-http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt
-
-
-The second argument to both constructors is a valid ISO Country
-Code. These codes are the upper-case two-letter codes
-as defined by ISO-3166.
-You can find a full list of these codes at a number of sites, such as:
-http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html";>
-http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-
-
-The second constructor requires a third argument--the
Variant.
-The Variant codes are vendor and browser-specific.
-For example, use WIN for Windows, MAC for Macintosh, and POSIX for POSIX.
-Where there are two variants, separate them with an underscore, and
-put the most important one first. For
-example, a Traditional Spanish collation might be referenced, with
-"ES", "ES", "Traditional_WIN".
-
-
-Because a OLocale object is just an identifier for a region,
-no validity check is performed when you construct a OLocale.
-If you want to see whether particular resources are available for the
-OLocale you construct, you must query those resources. For
-example, ask the NumberFormat for the locales it supports
-using its getAvailableLocales method.
-Note: When you ask for a resource f
Re: [API] Some more cleanup ideas
Stephan Bergmann wrote: > >using namespace com::sun::star would save some 5 additional > >characters - let me see what a test build yields... > > ...but would increase potential for ambiguities. > Yes, so I went for the css alias in the end. This change has been pushed to master. Cheers, -- Thorsten pgpj1cpJ4454U.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo57708.rtf |8 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 12
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 70 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 13 +++-
4 files changed, 73 insertions(+), 30 deletions(-)
New commits:
commit 7baca04727fbd3297c6e4b9815bf2a4695175e2e
Author: Miklos Vajna
Date: Fri Nov 30 17:15:35 2012 +0100
fdo#57708 testcase
Change-Id: I5064cb9bb9700483eac4d56a56e671a392e82f73
diff --git a/sw/qa/extras/rtfimport/data/fdo57708.rtf
b/sw/qa/extras/rtfimport/data/fdo57708.rtf
new file mode 100644
index 000..54a7579
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo57708.rtf
@@ -0,0 +1,8 @@
+{\rtf1\ansi\ansicpg1250\deff0\deflang1033{\fonttbl{\f0\fswiss\fcharset238
Metrostyle Extended;}}{\colortbl;\red0\green0\blue0;}{\info{\title }{\author
Crystal Reports}{\doccomm Powered By Crystal}{\company Crystal
Decisions}}{\*\userprops {\propname Business Objects Context
Information}\proptype30{\staticval
01734361CD07C3C85B968AA4B2781C480C308DEB5E1F83247788228D3179576779474C0EDA07FA11789515F5C58418E566CFBE6A992AA227B056A18BF687A22CF4C7A2A60E137F6E64ADB5B69ED3464CA2298397B1C63A46E7CA415DF52DCCA4B3EE086B2778F5C67ADA7979DE0AB40BE865BD20C51228AC3938C7268BEB053}{\propname
Business Objects Context Information1}\proptype30{\staticval
196223CE7A2CA417EF871437DC7F0AFC626}}
+\paperw11904\paperh16834\margl1416\margr849\margt849\margb849\gutter0\windowctrl\ftnbj\viewkind1\viewscale100\sectd\linex0\sbknone
+\sect
{\shp{\*\shpinst\shpleft1416\shptop879\shpright2719\shpbottom2138\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1{\sp{\sn
txflTextFlow}{\sv 0}}{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fBehindDocument}{\sv
1}}{\sp{\sn fLockAspectRatio}{\sv 0}}{\sp{\sn fPreferRelativeResize}{\sv
0}}{\sp{\sn pib}{\sv
{\pict\wmetafile6\picw1303\pich1259\picwgoal1303\pichgoal1259\picscalex100\picscaley100
89504e470d0a1a0a000d494844520010001008020090916836015049444154789c9592c14a02511486bf99714ccb322d7521140541cb
+6a11448b164150fb8a363d41f4083d40cba0655044d0a637a837682fd1a6a2488b10b23475bcb77b671c491dc1cee23077e67cf7fcff39139252f29f08b59e3e
+1dae8b4c45998ff501a82e070f5cbd3366733acb5c6fa609fc0872651236df0deeca7d002a6cc33d1b941a146ab49ca937e37610e0c590c5c92b67f926a07243
+b293613f8b1108a8a84aadb01575c9799edd0c895010a0ae71048e77b99b6a92e53861a387a48a6033c5d208c297a43ca8a3697601d217b010632dd9a9f34be0
+9968021698bea4c76ab72f5dd0d6216c3211e1bec2a0c5e59bce9303baa770c7bd38aca7d729692bcd4d512b53bb3b7cc2f45dd604ab098e67b499366025ce5e
+96a317fd2162e2d76725bdcd80b12a603aca4581e7aade97e14ec2916ca719ed96e4c54692f5241f755de7019641eacfaff10b469261dc6a800dd349454e44ae426082}{\pard
\pvpg\phpg\posx2969\posy1070\absw7935\absh-423\qc\vertalt\tx360\tx720\tx1080\tx1440\tx1800\tx2160\tx2520\tx2880\tx3240\tx3600\tx3960\tx4320\tx4680\tx5040\tx5400\tx5760\tx6120\tx6480\tx6840\tx7200\tx7560\tx7920{\ltrch\f0
\b\i0\ul0\strike0\fs35 \cf1 PM1 TEST\par}}}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index a201c36..7853fc3 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -126,6 +126,7 @@ public:
void testFdo52989();
void testFdo48442();
void testFdo55525();
+void testFdo57708();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -202,6 +203,7 @@ void Test::run()
{"fdo52989.rtf", &Test::testFdo52989},
{"fdo48442.rtf", &Test::testFdo48442},
{"fdo55525.rtf", &Test::testFdo55525},
+{"fdo57708.rtf", &Test::testFdo57708},
};
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -929,6 +931,16 @@ void Test::testFdo55525()
CPPUNIT_ASSERT_EQUAL(sal_Int16(1016), getProperty<
uno::Sequence >(xTableRows->getByIndex(0),
"TableColumnSeparators")[0].Position);
}
+void Test::testFdo57708()
+{
+// There were two issues: the doc was of 2 pages and the picture was
missing.
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+uno::Reference xDrawPageSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+// Two objects: a picture and a textframe.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xDraws->getCount());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 8063e36115a11ddf3db05928db9287947beee74d
Author: Miklos Vajna
Date: Fri Nov 30 16:32:56 2012 +0100
fdo#57708 fix RTF import of pictures right before text frames
Change-Id: Ibfeaadd5b48fd48c2c1f20de5dc272d9a326bfc4
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5a2f9b6..9c988d7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -274,7 +274,8 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
[PATCH] fdo#38838 UniString -> OUString in cui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1203 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/1203/1 fdo#38838 UniString -> OUString in cui Change-Id: I16eae4aff2b946421df2b65ecfbd1d9b2e2256b6 --- M cui/source/tabpages/tpcolor.cxx M cui/source/tabpages/tpgradnt.cxx M cui/source/tabpages/tphatch.cxx M cui/source/tabpages/tpline.cxx M cui/source/tabpages/tplnedef.cxx M cui/source/tabpages/tplneend.cxx M cui/source/tabpages/transfrm.cxx 7 files changed, 40 insertions(+), 40 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1203 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16eae4aff2b946421df2b65ecfbd1d9b2e2256b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] migrate 'Insert Bookmark' dialog to .ui file
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1199 -- To view, visit https://gerrit.libreoffice.org/1199 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c34c14df36a78133ff08c0f2f0ce1a01292067f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh Gerrit-Reviewer: Caolán McNamara Gerrit-Reviewer: Jack Leigh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/globals.hrc |2
sw/source/ui/app/app.src |5 +
sw/source/ui/cctrl/swlbox.cxx| 14
sw/source/ui/inc/bookmark.hxx| 13 ++--
sw/source/ui/inc/misc.hrc|1
sw/source/ui/inc/swlbox.hxx |7 +-
sw/source/ui/misc/bookmark.cxx | 68 ---
sw/source/ui/misc/bookmark.hrc | 25
sw/source/ui/misc/bookmark.src | 73
sw/source/ui/utlui/swrenamexnameddlg.cxx |1
sw/uiconfig/swriter/ui/insertbookmark.ui | 91 +++
13 files changed, 159 insertions(+), 143 deletions(-)
New commits:
commit 42f6308d1b4c352b8949a4ab8c2c77388d4a29e9
Author: Jack Leigh
Date: Thu Nov 29 21:44:20 2012 +
migrate 'Insert Bookmark' dialog to .ui file
STR_REMOVE_WARNING moved to globals.hrc so also misc.hrc no longer
required in swrenamexnameddlg.cxx
Conflicts:
sw/source/ui/misc/bookmark.src
Change-Id: I5c34c14df36a78133ff08c0f2f0ce1a01292067f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index bf8ba79..fbd038f 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -141,7 +141,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/index/multmrk.src \
sw/source/ui/lingu/olmenu.src \
sw/source/ui/misc/autocorr.src \
-sw/source/ui/misc/bookmark.src \
sw/source/ui/misc/docfnote.src \
sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index ca8535f..890ae28 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
+ sw/uiconfig/swriter/ui/insertbookmark \
sw/uiconfig/swriter/ui/insertbreak \
sw/uiconfig/swriter/ui/insertfootnote \
sw/uiconfig/swriter/ui/insertscript \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index e0f55ae..a7ed844 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -65,6 +65,8 @@
#define STR_FOOTNOTE_DIALOG_CHAR(RC_GLOBALS_BEGIN + 39)
+#define STR_REMOVE_WARNING (RC_GLOBALS_BEGIN + 40)
+
// DIALOGS ---
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c730e9f..d56012d 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -225,6 +225,11 @@ String STR_FOOTNOTE_DIALOG_CHAR
Text [ en-US ] = "Character" ;
};
+String STR_REMOVE_WARNING
+{
+Text [ en-US ] = "The following characters are not valid and have been
removed: ";
+};
+
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx
index 939ac31..6e6a85b 100644
--- a/sw/source/ui/cctrl/swlbox.cxx
+++ b/sw/source/ui/cctrl/swlbox.cxx
@@ -49,10 +49,22 @@ SwBoxEntry::SwBoxEntry(const SwBoxEntry& rOld) :
{
}
-SwComboBox::SwComboBox(Window* pParent, const ResId& rId, sal_uInt16
nStyleBits ):
+SwComboBox::SwComboBox(Window* pParent, sal_uInt16 nStyleBits) :
+ComboBox(pParent),
+nStyle(nStyleBits)
+{
+Init();
+}
+
+SwComboBox::SwComboBox(Window* pParent, const ResId& rId, sal_uInt16
nStyleBits) :
ComboBox(pParent, rId),
nStyle(nStyleBits)
{
+Init();
+}
+
+void SwComboBox::Init()
+{
// create administration for the resource's Stringlist
sal_uInt16 nSize = GetEntryCount();
for( sal_uInt16 i=0; i < nSize; ++i )
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index d7fc9c5..80cf41b 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -37,6 +37,7 @@ class BookmarkCombo : public SwComboBox
virtual longPreNotify(NotifyEvent& rNEvt);
public:
+BookmarkCombo( Window* pWin );
BookmarkCombo( Window* pWin, const ResId& rResId );
sal_uInt16 GetSelectEntryCount() const;
@@ -47,23 +48,21 @@ public:
class SwInsertBookmarkDlg: public SvxStandardDialog
{
-FixedLine aBookmarkFl;
-BookmarkCombo aBookmarkBox;
-OKButtonaOkBtn;
-CancelButtonaCancelBtn;
-PushButton aDeleteBtn;
+BookmarkCombo* m_pBookmarkBox;
+OKButton* m_pOkBtn;
+PushButton* m_pDeleteBtn;
String sRemoveWarning;
SwWrtShell &rSh;
SfxRequest& rReq;
-DECL_LINK( ModifyHdl, BookmarkCombo * );
+DECL_LINK(ModifyHdl, BookmarkCombo *);
DECL_LINK(DeleteHdl, void *);
virtual void Apply();
public:
-SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rR
[Libreoffice-commits] .: 5 commits - cui/Library_cui.mk cui/source cui/uiconfig cui/UI_cui.mk vcl/source
cui/Library_cui.mk |1
cui/UI_cui.mk|2
cui/source/inc/cuires.hrc|1
cui/source/options/personalization.cxx | 107 +
cui/source/options/personalization.hxx | 51 ++
cui/source/options/treeopt.cxx |3
cui/source/options/treeopt.src |1
cui/uiconfig/ui/personalization_tab.ui | 240 +++
cui/uiconfig/ui/select_persona_dialog.ui | 179 +++
vcl/source/window/builder.cxx|8 +
10 files changed, 593 insertions(+)
New commits:
commit 2075974c18ba507b31986622530904efc943
Author: Jan Holesovsky
Date: Fri Nov 30 10:37:34 2012 +0100
Personas: .ui file for the Select Persona dialog.
Change-Id: Ibc493a486e5752525520cd7e21d6287d49edf681
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 2413872..53490bb 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/positionpage \
+ cui/uiconfig/ui/select_persona_dialog \
cui/uiconfig/ui/specialcharacters \
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/twolinespage \
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 906f23c..e6d6a39 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -9,7 +9,21 @@
#include "personalization.hxx"
-#include
+/** Dialog that will allow the user to choose a Persona to use.
+
+So far there is no better possibility than just to paste the URL from
+http://www.getpersona.com ...
+*/
+class SelectPersonaDialog : public ModalDialog
+{
+public:
+SelectPersonaDialog( Window *pParent );
+};
+
+SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
+: ModalDialog( pParent, "SelectPersonaDialog",
"cui/ui/select_persona_dialog.ui" )
+{
+}
SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const
SfxItemSet &rSet )
: SfxTabPage( pParent, "PersonalizationTabPage",
"cui/ui/personalization_tab.ui", rSet )
@@ -84,6 +98,9 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectBackground,
PushButton*, /*pButton*/
IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ )
{
+SelectPersonaDialog aDialog( NULL );
+/* TODO handle the ret val sal_Int16 nReturn =*/ aDialog.Execute();
+
return 0;
}
diff --git a/cui/uiconfig/ui/select_persona_dialog.ui
b/cui/uiconfig/ui/select_persona_dialog.ui
new file mode 100644
index 000..5715e67
--- /dev/null
+++ b/cui/uiconfig/ui/select_persona_dialog.ui
@@ -0,0 +1,179 @@
+
+
+
+
+
+False
+5
+dialog
+
+
+True
+False
+2
+
+
+True
+False
+0
+First visit Firefox
Personas (http://www.getpersonas.com) and find Persona you like, and want to
choose for LibreOffice.
+True
+
+
+True
+True
+0
+
+
+
+
+True
+False
+end
+
+
+gtk-ok
+False
+True
+True
+True
+True
+
+
+False
+False
+0
+
+
+
+
+gtk-cancel
+False
+True
+True
+True
+True
+
+
+False
+False
+1
+
+
+
+
+gtk-help
+False
+True
+True
+True
+True
+
+
+False
+False
+2
+
+
+
+
+False
+True
+end
+0
+
+
+
+
+True
+False
+
+
+
+
+
+Visit Firefox
Personas
+False
+True
+True
+True
+
+
+False
+False
+1
+
+
+
+
+
+
+
+True
+True
+2
+
+
+
+
+True
+False
+0
+Then copy the URL of
page that contains the Persona to clipboard, and paste it to the input field
below
[PATCH] fdo#38838 UniString -> OUString in cui
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1202 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1202/1 fdo#38838 UniString -> OUString in cui Change-Id: I9b629cad4d9b6d4c086bfff47f1d3e9779b2c24d --- M cui/source/tabpages/numfmt.cxx M cui/source/tabpages/numpages.cxx M cui/source/tabpages/page.cxx M cui/source/tabpages/tpbitmap.cxx 4 files changed, 42 insertions(+), 43 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1202 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b629cad4d9b6d4c086bfff47f1d3e9779b2c24d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failures of LO master on openSUSE
Magically the dev-install just started working again. Thanks all for the advice! 2012/11/30 Stephan van den Akker > No, but I did use autogen (...) --without-help > > And to be more precise: building works, but "make dev-install" fails, even > on a freshly cloned tree. > > > > 2012/11/30 Eike Rathke > >> Hi Stephan, >> >> On Wednesday, 2012-11-28 15:21:32 +0100, Stephan van den Akker wrote: >> >> > : WARNING: Source for swriter_en-US.zip not found! >> > : WARNING: Source for swriter_en-US.zip not found! >> > : WARNING: Using swriter_en-US.zip instead of swriter_en-US.zip was not >> > successful >> > >> > Looks to me like some i18n files are missing. Anyone have an idea how to >> > solve this? >> >> Missing files are help content, e.g. should be built in >> ./helpcontent2/unxlngx6.pro/bin/swriter_en-US.zip >> >> and delivered to >> ./solver/unxlngx6.pro/pck/swriter_en-US.zip >> >> Did you by chance configure --without-helppack-integration ? >> >> Eike >> >> -- >> LibreOffice Calc developer. Number formatter stricken i18n >> transpositionizer. >> GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD >> Support the FSFE, care about Free Software! >> https://fsfe.org/support/?erack >> > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: random number generators for calc
I've had a look at what Gnumeric offers, and they've done a big job on random number generation. Comparing with what is available in boost I've separated the list into rand functions which could be quickly implemented using boost and those which can't (and would require more intelligence to implement). Another problem might be that boost 1.44 which is currently used in libreoffice has even fewer distribution functions implemented. If there's interest, I'd be happy to work on a patch to implement the first half of the functions into core/sal/rtl/source/math.cxx or maybe random.cxx? However, random.* seems not that well maintained as there's no random.hxx. http://www.boost.org/doc/libs/1_52_0/doc/html/boost_random/reference.html#boost_random.reference.distributions gnumeric rand functions (available in boost) randbernoulli random variate from a Bernoulli distribution randbetween a random integer number between and including bottom and randbinom random variate from a binomial distribution randcauchy random variate from a Cauchy or Lorentz distribution randchisq random variate from a Chi-square distribution randdiscreterandom variate from a finite discrete distribution randexp random variate from an exponential distribution randfdist random variate from an F distribution randgamma random variate from a Gamma distribution randgeomrandom variate from a geometric distribution randlognorm random variate from a lognormal distribution randnegbinomrandom variate from a negative binomial distribution randnormrandom variate from a normal distribution randpoisson random variate from a Poisson distribution randtdist random variate from a Student t distribution randuniform random variate from the uniform distribution from a to b randweibull random variate from a Weibull distribution gnumeric rand functions (not available in boost) randbetarandom variate from a Beta distribution randexppow random variate from an exponential power distribution randgumbel random variate from a Gumbel distribution randhyperg random variate from a hypergeometric distribution randlandau random variate from the Landau distribution randlaplace random variate from a Laplace distribution randlevyrandom variate from a Levy distribution randlog random variate from a logarithmic distribution randlogisticrandom variate from a logistic distribution randnormtailrandom variate from the uppertail of a normal distribution randpareto random variate from a Pareto distribution randrayleighrandom variate from a Rayleigh distribution randrayleightailrandom variate from the tail of a Rayleigh distri randsnorm random variate from a skew normal distribution randstdist random variate from a skew t distribution ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: source/text
source/text/scalc/05/empty_cells.xhp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b91788bdfe56875a9342d011439f954e50d9c751 Author: Andras Timar Date: Fri Nov 30 17:03:34 2012 +0100 -> to please pofilter Change-Id: I6708f2d8d99d8b948733fb29b0a9279892bd3da9 diff --git a/source/text/scalc/05/empty_cells.xhp b/source/text/scalc/05/empty_cells.xhp index 774afb4..38951eb 100644 --- a/source/text/scalc/05/empty_cells.xhp +++ b/source/text/scalc/05/empty_cells.xhp @@ -47,7 +47,7 @@ In older versions of the software, empty cells were forced to numeric 0 in some contexts and to empty string in others, except in direct comparison where =A1=0 and =A1="" both resulted in TRUE if A1 was empty. Emptiness now is inherited until used, so both =VLOOKUP(...)=0 and =VLOOKUP(...)="" give TRUE if the lookup resulted in an empty cell being returned. A simple reference to an empty cell is still displayed as numeric 0 but is not necessarily of type numeric anymore, so also comparisons with the referencing cell work as expected. For the following examples, A1 contains a number, B1 is empty, C1 contains the reference to B1: -A1: 1 B1:C1: =B1 (displays 0) +A1: 1 B1: C1: =B1 (displays 0) =B1=0 => TRUE =B1="" => TRUE =C1=0 => TRUE @@ -65,7 +65,7 @@ =ISBLANK(VLOOKUP(1;A1:C1;2)) => TRUE (B1, previously was FALSE) =ISBLANK(VLOOKUP(1;A1:C1;3)) => FALSE (C1) Note that Microsoft Excel behaves different and always returns a number as the result of a reference to an empty cell or a formula cell with the result of an empty cell. For example: -A1: +A1: B1: =A1 => displays 0, but is just a reference to an empty cell =ISNUMBER(A1) => FALSE =ISTEXT(A1) => FALSE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce7c249d9355238ea6d0cba2ed1f5cb4337ed83d Author: Andras Timar Date: Fri Nov 30 17:03:34 2012 +0100 Updated core Project: help b91788bdfe56875a9342d011439f954e50d9c751 -> to please pofilter diff --git a/helpcontent2 b/helpcontent2 index 4d46d7e..b91788b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4d46d7ee993ea549cf959bc012a616308b3496c9 +Subproject commit b91788bdfe56875a9342d011439f954e50d9c751 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [API] Some more cleanup ideas
On 11/29/2012 06:42 PM, Thorsten Behrens wrote: Stephan Bergmann wrote: Right, forgot about the Clang case. So that would mean keeping SAL_THROW non-deprecated, making it a nop with Clang --disable-dbgutil (but making it a non-nop for GCC generally), and changing the cppumaker-generated headers to use SAL_THROW. So the change meanwhile got committed as 0295bd6b3f21dd648af6145ca23d90467f3cec73, and while discussion was ongoing here & on irc, I went the "bin exception specs entirely" route for c++. I concede there's potential debugging utility in having compilers generate runtime checks for exception specs in dbg_util mode, I wonder though if this is worth the mess we'd generate. With SAL_THROW & exception specs on api headers removed, there's a very nice & substantial cleanup task possible subsequently, that removes it from all implementation methods, too. I'm not sure this is a good move. To be able to programmatically react to an exception raised by a UNO method (which is the raison d'être of non-runtime UNO exceptions), the specification of that method must document the method's behavior with respect to raising that exception, and any implementation of the method must adhere to that specification. However, with that part of a UNO method's interface moved out of sight of a programmer writing a C++ implementation of that method, I fear that adherence to specification will degrade in practice. And that negatively affects an area where we do not shine anyway: reaction to errors. (Which is arguably a tricky area to begin with, but so would probably benefit more from increasing awareness and tooling than from reducing them.) There is indeed a trend in C++ to move away from dynamic exception specifications, but I see none of the problems that motivated that trend affecting us in this specific case. The compiler-induced checks for unexpected that are inherent to dynamic exception specifications and cause space/time overhead can be addressed in production code with -fno-enfore-eh-specs or similar, or could be addressed with SAL_THROW where "or similar" does not work. There is one concern with the old scheme, namely that exceptions like std::bad_alloc cannot pass out of UNO method implementations, so it is not possible to programmatically react to some isolated operation running out of memory, say. However, for the latter to work much more preparation would be needed (like all the involved functions sporting strong exception guarantees), it is unclear whether those relatively coarse-grained UNO method invocations would not lie outside such programatic catch-and-handle areas anyway, and this could also be made to work with the old scheme, by consistently adding std::exception or similar to the dynamic exception specifications. Which leaves us with the benefit of shorter, less visually cluttered declarations of C++ functions. But, as I argue above, I am not sure that is an overall benefit at all. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][RESOLVED] title page and autoformat
On Thu, 2012-11-29 at 10:43 +, Gokul Swaminathan wrote: > Dear Caolan, > Title page and bookmark widget converted for writer. oops!, sorry, the title page dialog is already converted to .ui format since April :-(, it was one of the first ones I did. As a rule of thumb, a dialog is already converted to .ui if you can resize it or it has bold text for frame titles in a daily build (or a self build) Seeing as jleigh is looking at some of the writer "insert" menu, there are some low hanging dialogs in the "file" menu of "printer settings", "digital signatures" and "versions" if you want to try and convert those to .ui C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] migrate 'Insert Footnote' dialog to .ui file
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1193 -- To view, visit https://gerrit.libreoffice.org/1193 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If16285d85bca187b2e929f0327b15f103b5d786f Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh Gerrit-Reviewer: Caolán McNamara Gerrit-Reviewer: Jack Leigh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/AllLangResTarget_sw.mk|1
sw/UI_swriter.mk |1
sw/inc/globals.hrc |2
sw/source/ui/app/app.src |4
sw/source/ui/inc/insfnote.hxx| 38 +--
sw/source/ui/misc/insfnote.cxx | 116 +-
sw/source/ui/misc/insfnote.hrc | 34 ---
sw/source/ui/misc/insfnote.src | 138
sw/uiconfig/swriter/ui/insertfootnote.ui | 341 +++
9 files changed, 422 insertions(+), 253 deletions(-)
New commits:
commit 99d0ddf89c1c13f6b897d6b11009b777c6d735ca
Author: Jack Leigh
Date: Thu Nov 29 00:07:04 2012 +
migrate 'Insert Footnote' dialog to .ui file
Conflicts:
sw/source/ui/misc/insfnote.src
Change-Id: If16285d85bca187b2e929f0327b15f103b5d786f
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 42e3303..bf8ba79 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -145,7 +145,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/misc/docfnote.src \
sw/source/ui/misc/glosbib.src \
sw/source/ui/misc/glossary.src \
-sw/source/ui/misc/insfnote.src \
sw/source/ui/misc/num.src \
sw/source/ui/misc/numberingtypelistbox.src \
sw/source/ui/misc/outline.src \
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index ade3a51..ca8535f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/footnotepage \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbreak \
+ sw/uiconfig/swriter/ui/insertfootnote \
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
sw/uiconfig/swriter/ui/linenumbering \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 4473eb4..e0f55ae 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -63,6 +63,8 @@
#define STR_JAVA_EDIT (RC_GLOBALS_BEGIN + 38)
+#define STR_FOOTNOTE_DIALOG_CHAR(RC_GLOBALS_BEGIN + 39)
+
// DIALOGS ---
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 8f86c61..c730e9f 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -220,6 +220,10 @@ String STR_JAVA_EDIT
Text [ en-US ] = "Edit Script" ;
};
+String STR_FOOTNOTE_DIALOG_CHAR
+{
+Text [ en-US ] = "Character" ;
+};
InfoBox MSG_ERROR_SEND_MAIL
{
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx
index 53253a2..71ee27a 100644
--- a/sw/source/ui/inc/insfnote.hxx
+++ b/sw/source/ui/inc/insfnote.hxx
@@ -28,6 +28,8 @@
class SwWrtShell;
+class VclFrame;
+
class SwInsFootNoteDlg: public SvxStandardDialog
{
SwWrtShell &rSh;
@@ -37,28 +39,26 @@ class SwInsFootNoteDlg: public SvxStandardDialog
CharSet eCharSet;
sal_BoolbExtCharAvailable;
sal_BoolbEdit;
-FixedLine aNumberFL;
-RadioButton aNumberAutoBtn;
-RadioButton aNumberCharBtn;
-EditaNumberCharEdit;
-PushButton aNumberExtChar;
+
+VclFrame* m_pNumberFrame;
+RadioButton*m_pNumberAutoBtn;
+RadioButton*m_pNumberCharBtn;
+Edit* m_pNumberCharEdit;
+PushButton* m_pNumberExtChar;
// everything for the selection footnote/endnote
-FixedLineaTypeFL;
-RadioButton aFtnBtn;
-RadioButton aEndNoteBtn;
+RadioButton*m_pFtnBtn;
+RadioButton*m_pEndNoteBtn;
-OKButtonaOkBtn;
-CancelButtonaCancelBtn;
-HelpButton aHelpBtn;
-ImageButton aPrevBT;
-ImageButton aNextBT;
+PushButton* m_pOkBtn;
+PushButton* m_pPrevBT;
+PushButton* m_pNextBT;
DECL_LINK(NumberCharHdl, void *);
-DECL_LINK( NumberEditHdl, void * );
+DECL_LINK(NumberEditHdl, void *);
DECL_LINK(NumberAutoBtnHdl, void *);
DECL_LINK(NumberExtCharHdl, void *);
-DECL_LINK( NextPrevHdl, Button * );
+DECL_LINK(NextPrevHdl, Button *);
virtual voidApply();
@@ -69,13 +69,13 @@ public:
~SwInsFootNoteDlg();
CharSet GetCharSet() { return eCharSet; }
-sal_BoolIsExtCharAvailable() { return bExtCharAvailable; }
+sal_BoolIsExtCharAvailable() { return bExtCharAvailable; }
String GetFontName() { return aFontName; }
-sal_BoolIsEndNote() { return aEndNoteBtn.IsChecked(); }
+sal_BoolIsEndNote() { return m_pEndNoteBtn->IsChecked(); }
String GetStr()
{
-if ( aNumberCharBtn.IsChecked() )
-return aNumberCharEdit.GetText();
+if ( m_pNumberCharBtn->IsChecked() )
+
[Libreoffice-commits] .: 2 commits - idlc/inc idlc/source idlc/test sal/inc
idlc/inc/idlc/astoperation.hxx |2 --
idlc/inc/idlc/errorhandler.hxx |3 ---
idlc/source/errorhandler.cxx |6 --
idlc/test/interface.idl|1 -
sal/inc/sal/types.h| 23 +++
5 files changed, 11 insertions(+), 24 deletions(-)
New commits:
commit e65e90562432a8b8279a9c79a5e347aad0090e81
Author: Stephan Bergmann
Date: Fri Nov 30 16:33:19 2012 +0100
Find a more sensible place for css
Change-Id: I33fe83c47954f62d8b678430e97cf711a98568d1
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index a6be155..53d1645 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -374,20 +374,27 @@ typedef struct _sal_Sequence
#define SAL_THROW_EXTERN_C()
#endif
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
#ifdef __cplusplus
+
enum __sal_NoAcquire
{
/** definition of a no acquire enum for ctors
*/
SAL_NO_ACQUIRE
};
-#endif /* __cplusplus */
+namespace com { namespace sun { namespace star { } } }
+
+/** short-circuit extra-verbose API namespaces
+
+ @since LibreOffice 4.0
+*/
+namespace css = ::com::sun::star;
-#ifdef __cplusplus
-}
#endif /* __cplusplus */
#ifdef __cplusplus
@@ -411,14 +418,6 @@ template< typename T1, typename T2 > inline T1
static_int_cast(T2 n) {
}
-namespace com { namespace sun { namespace star { } } }
-
-/** short-circuit extra-verbose API namespaces
-
- @since LibreOffice 4.0
-*/
-namespace css = ::com::sun::star;
-
#else /* __cplusplus */
/**
commit 299036996af6ae8897b1f2e07bbab7074955dfe8
Author: Stephan Bergmann
Date: Fri Nov 30 16:24:17 2012 +0100
[oneway] removal cleanup
Change-Id: I1d60bb4042753bd18475166054ad57dceb2fc97d
diff --git a/idlc/inc/idlc/astoperation.hxx b/idlc/inc/idlc/astoperation.hxx
index 304113c..90ea5c9 100644
--- a/idlc/inc/idlc/astoperation.hxx
+++ b/idlc/inc/idlc/astoperation.hxx
@@ -24,8 +24,6 @@
namespace typereg { class Writer; }
-#define OP_NONE 0x
-
class AstType;
class AstOperation : public AstDeclaration
diff --git a/idlc/inc/idlc/errorhandler.hxx b/idlc/inc/idlc/errorhandler.hxx
index 978003f..0853bb1 100644
--- a/idlc/inc/idlc/errorhandler.hxx
+++ b/idlc/inc/idlc/errorhandler.hxx
@@ -36,7 +36,6 @@ enum ErrorCode
EIDL_MULTIPLE_BRANCH, // More than one union branch with this label
EIDL_COERCION_FAILURE, // Coercion failure
EIDL_SCOPE_CONFLICT,// Between fwd declare and full declare
-EIDL_ONEWAY_CONFLICT, // Between op decl and argument direction
EIDL_DISC_TYPE, // Illegal discriminator type in union
EIDL_LABEL_TYPE,// Mismatch with discriminator type in union
EIDL_ILLEGAL_ADD, // Illegal add action
@@ -54,13 +53,11 @@ enum ErrorCode
EIDL_DECL_NOT_DEFINED, // Forward declared but never defined
EIDL_FWD_DECL_LOOKUP, // Tried to lookup in fwd declared intf
EIDL_RECURSIVE_TYPE,// Illegal recursive use of type
-EIDL_NONVOID_ONEWAY,// Non-void return type in oneway operation
EIDL_NOT_A_TYPE,// Not a type
EIDL_TYPE_NOT_VALID,// Type is not valid in this context
EIDL_INTERFACEMEMBER_LOOKUP,// interface is not defined or a fwd
declaration not exists
EIDL_SERVICEMEMBER_LOOKUP,
EIDL_TYPE_IDENT_CONFLICT, // type and identifier has equal names
-EIDL_ONEWAY_RAISE_CONFLICT, // oneway function raised excpetion conflict
EIDL_WRONGATTRIBUTEFLAG,
EIDL_DEFINED_ATTRIBUTEFLAG,
EIDL_WRONGATTRIBUTEKEYWORD,
diff --git a/idlc/source/errorhandler.cxx b/idlc/source/errorhandler.cxx
index 2b91d4d..447e8c3 100644
--- a/idlc/source/errorhandler.cxx
+++ b/idlc/source/errorhandler.cxx
@@ -42,8 +42,6 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "coercion failure ";
case EIDL_SCOPE_CONFLICT:
return "definition scope is different than fwd declare scope, ";
-case EIDL_ONEWAY_CONFLICT:
-return "oneway operation with OUT|INOUT parameters or raises
exceptions, ";
case EIDL_DISC_TYPE:
return "union with illegal discriminator type, ";
case EIDL_LABEL_TYPE:
@@ -78,8 +76,6 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "";
case EIDL_RECURSIVE_TYPE:
return "illegal recursive use of type: ";
-case EIDL_NONVOID_ONEWAY:
-return "non-void return type in oneway operation: ";
case EIDL_NOT_A_TYPE:
return "specified symbol is not a type: ";
case EIDL_TYPE_NOT_VALID:
@@ -90,8 +86,6 @@ static const sal_Char* errorCodeToMessage(ErrorCode eCode)
return "error in lookup of symbol, expected service is not defined: ";
case EIDL_TYPE_IDENT_CONFLICT:
return "type and parameter/member name are equal: ";
-case EIDL_ONEWAY_RAISE_CONFLICT:
-return "oneway operation cannot raises exceptions: ";
case EIDL_WRONGATTRIBUTEFLAG:
return "the used flag is not valid in this context: ";
case EIDL_DEFINED_ATTRIB
Re: Build error libxmlsec
On Wed, 2012-11-28 at 19:02 -0200, Marcos Souza wrote: > Hi guys, > > I'm getting this error when trying to build the master: > checking for gnutls libraries >= 0.8.1... no > checking for mscrypto libraries... none > checking for crypto library... configure: error: At least one crypto > library should exist for xmlsec1 > dmake: Error code 1, while making > './unxlngi6.pro/misc/build/so_configured_so_xmlsec1' Does this still fail, or did 5f45e7424bc548ac524f96d966eac1363480 fix this for you ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: screencast instructions
Hi Noel, *,
On Fri, Nov 30, 2012 at 3:28 PM, Noel Power wrote:
> Christian
> On 30/11/12 13:16, Christian Lohmaier wrote:
>
> doh!! but obviously I copied the wrong link
> http://users.freedesktop.org:8080/~noelp/zoom/zoomcast.ogv is what I meant
Ah :-)
>> for me the high bit rate "--v_bitrate 200" was necessary to smoothly
>> capture mouse movements,
>> Strange that the bitrate has impact - should have been the framerate..
>> But with low bitrate the image gets "muddy", so maybe that's what you
>> meant.
>
> no really for me the main problem was it seemed not to pick up fast
> movements I can't recall exactly now whether it was additionally 'muddy',
> don't think it was but...
Hmm. Maybe it couldn't keep up with encoding so it was dropping
frames, and higher bitrate=less work to squeeze bits, so that did
succeed?
>>> [...]
> unfortunately aegisub really just didn't work, complained about no video
> provider ( or some error that sounded vaguely like that ). From looking
> around it appeared it should use ffmpeg [...]
aegisub uses ffms2 AKA ffmpegsource - so close enough, but not quite
the same thing :-)
http://code.google.com/p/ffmpegsource/
> [...]
>
>> My key point is to not use a chain of lossless conversions, but only
>> to do the lossless one as last step.
>>
> as interesting as the arcade of options to the various tools above is (
> thanks for posting them :-),
:-) they look much, but really they aren't that obscure...
> sometime I will find the time to look at them
> more closely ) what I really was after was a way to go from ogv video +.srt
> file ( or .ass if you prefer ) -> ogv file with re-encoded subtitles ideally
> *without* the need to download restricted formats [*]
Oh, x264 just has a nice lossless format, but of course no need to use
it if you don't want to.. ffmpeg has the ffv1 format that is also
lossless, although not quite as efficient.
ffmpeg -f x11grab -r 15 -s ${WIDTH}x$HEIGHT -i :0.0+$POS_Y,$POS_Y
-vcodec ffv1 -threads 0 -sameq output.mkv
will capture the selected area and use the ffv1 codec.
> not sure if the info
> above tells me that,
No, definitely doesn't tell you that you have to use specific formats,
it just shows that you can use virtually any encoder with both mplayer
as well as ffmpeg (in case the desired output is not supported
directly or option-handling is much easier when running the tools
separately) by using yuv4mpeg streams.
ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Petr Mladek changed: What|Removed |Added Depends on|40465 | -- 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] .: configure.ac Makefile.top
Makefile.top |4 ++--
configure.ac |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 81b959dd976d4caf8a5be9ef7e9cc343ab2f6289
Author: Peter Foley
Date: Fri Nov 30 10:20:28 2012 -0500
cosmetic fixes
Change-Id: I763412bd1b6713b91c2e4a8d575ee2a14e9d5cf2
diff --git a/Makefile.top b/Makefile.top
index 559b300..3cd9034 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -29,10 +29,10 @@ endif
# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake)
$(SRCDIR)/config_host.mk
mkdir -p $(dir $@)
- echo -n "gbuild_modules:=" > $@
+ echo -n "gbuild_modules:= " > $@
for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
echo >> $@
- echo -n "dmake_modules:=" >> $@
+ echo -n "dmake_modules:= " >> $@
for m in */prj/dmake; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
echo >> $@
diff --git a/configure.ac b/configure.ac
index 4cfcb92..e0b8342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5821,7 +5821,7 @@ fi
AC_SUBST([JITC_PROCESSOR_TYPE])
if test $_os = "WINNT"; then
-AC_MSG_CHECKING([for Microsoft_VC"$VCVER"_CRT_x86.msm])
+AC_MSG_CHECKING([for Microsoft_VC${VCVER}_CRT_x86.msm])
if ./oowintool --msvc-find-msms; then
AC_MSG_RESULT([yes])
SCPDEFS="$SCPDEFS -DWITH_VC"$VCVER"_REDIST"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - extensions/Executable_pluginapp.bin.mk extensions/StaticLibrary_plugcon.mk vcl/unx
extensions/Executable_pluginapp.bin.mk |2 -- extensions/StaticLibrary_plugcon.mk| 11 ++- vcl/unx/gtk/window/gtksalmenu.cxx | 10 ++ 3 files changed, 16 insertions(+), 7 deletions(-) New commits: commit 1b123a4bd821e1d43c64418652b69a782cd243a2 Author: David Tardon Date: Wed Nov 28 17:42:35 2012 +0100 avoid circular dep between vcl and framework Change-Id: Ibcb547b2b911d382eafa1fd8a9adb2e8b6efbfe2 diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index d3c20a2..605db0d 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -20,12 +20,14 @@ # include #endif -#include - -#include - #include +// FIXME Copied from framework/inc/framework/menuconfiguration.hxx to +// avoid circular dependency between modules. It should be in a common +// header (probably in vcl). +const sal_uInt16 START_ITEMID_WINDOWLIST= 4600; +const sal_uInt16 END_ITEMID_WINDOWLIST = 4699; + static sal_Bool bMenuVisibility = sal_False; /* commit 334a58130bdd4afa0bbc2e65d78f8f5709b0b618 Author: David Tardon Date: Sun Nov 25 16:56:54 2012 +0100 add missing deps for tools/link.hxx Change-Id: I5e83cd97978ea61c749f1d9be17ec0e9e0809127 diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 43e8ea3..8bfea65 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin)) -$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc)) - $(eval $(call gb_Executable_use_external,pluginapp.bin,npapi_headers)) $(eval $(call gb_Executable_set_include,pluginapp.bin,\ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 663184d..ba94b0b 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -31,7 +31,16 @@ endif $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) -$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc)) +$(eval $(call gb_StaticLibrary_use_packages,plugcon,\ +basegfx_inc \ +comphelper_inc \ +cppu_inc \ +i18npool_inc \ +np_sdk_inc \ +tools_inc \ +unotools_inc \ +vcl_inc \ +)) $(eval $(call gb_StaticLibrary_use_external,plugcon,npapi_headers)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fwd: solaris/smartos support planned?
On 30/11/12 15:51, Yaroslav Tarasenko wrote: > Hello, > > are there any plans to have solaris port of libreoffice oficially > supported? > > What is the opinion of developers on the topic? Is there a future > for solaris/illumos port? if somebody steps up to do the work, sure why not... ... Solaris being very similar to Linux means that it shouldn't be that much effort to maintain it, but right now the status is nobody is doing the maintenance, and the last work to get the the Solaris/GCC port to work at all was several months ago. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: offapi/com
offapi/com/sun/star/xforms/Binding.idl | 13 +
offapi/com/sun/star/xml/NamespaceContainer.idl |2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 6bf05adf3f46ca74ccda0d3c82399ab63343c35d
Author: Michael Stahl
Date: Fri Nov 30 15:57:24 2012 +0100
un-deprecate com::sun::star::xml::NamespaceContainer
as it is apparently used, though i don't know if those properties are
intentinally undocumented implementation details or accidentally
undocumented due to lack of time.
Change-Id: I0b5c564a8d49fb28aca3a6c1e15816f37ed20519
diff --git a/offapi/com/sun/star/xforms/Binding.idl
b/offapi/com/sun/star/xforms/Binding.idl
index ccb5276..8f2df2c 100644
--- a/offapi/com/sun/star/xforms/Binding.idl
+++ b/offapi/com/sun/star/xforms/Binding.idl
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
module com { module sun { module star { module xforms {
@@ -61,6 +62,18 @@ service Binding
@see com::sun::star::form::binding::ValidatableControlModel
*/
interface com::sun::star::form::validation::XValidator;
+
+/** among other properties, there is this one
+
+It is unclear to me whether this is an implementation detail
+or a supported interface.
+The value supports the service
+com::sun::star::xml::NamespaceContainer
+
+@see com::sun::star::xml::NamespaceContainer
+ */
+[optional, property] com::sun::star::container::XNameContainer
+BindingNamespaces;
};
diff --git a/offapi/com/sun/star/xml/NamespaceContainer.idl
b/offapi/com/sun/star/xml/NamespaceContainer.idl
index 6b9c2fa..4103acf 100644
--- a/offapi/com/sun/star/xml/NamespaceContainer.idl
+++ b/offapi/com/sun/star/xml/NamespaceContainer.idl
@@ -28,7 +28,7 @@ module com { module sun { module star { module xml {
Each namespace is accessed with its prefix and the URL is stored as a
string.
-@deprecated This appears to be unused.
+@see com::sun::star::xforms::Binding
*/
published service NamespaceContainer
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/drawview.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 1d6713a72631cf38267cc0a154a6c25244f26ab5
Author: Jan Holesovsky
Date: Fri Nov 30 15:55:59 2012 +0100
Fix indentation.
Change-Id: I49ebb9f7b1605884ebb2071b1017e9dec5d05577
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 85e5402..1908fda 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -769,7 +769,9 @@ void ScDrawView::SyncForGrid( SdrObject* pObj )
{
SdrObjList *pLst = ((SdrObjGroup*)pObj)->GetSubList();
for ( sal_uLong i = 0, nCount = pLst->GetObjCount(); i < nCount; ++i )
-SyncForGrid( pLst->GetObj( i ) ); }
+SyncForGrid( pLst->GetObj( i ) );
+}
+
ScSplitPos eWhich = pViewData->GetActivePart();
ScGridWindow* pGridWin = (ScGridWindow*)pViewData->GetActiveWin();
ScDrawObjData* pData = ScDrawLayer::GetObjDataTab( pObj, nTab );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: solaris/smartos support planned?
Hello, are there any plans to have solaris port of libreoffice oficially supported? What is the opinion of developers on the topic? Is there a future for solaris/illumos port? Thanks for replies. -- Regards, Yaroslav. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44664, which changed state. Bug 44664 Summary: cups landscape woes with pdf: printer truncates Landscape orientation pages to Portrait dimensions https://bugs.freedesktop.org/show_bug.cgi?id=44664 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
Re: screencast instructions
Christian On 30/11/12 13:16, Christian Lohmaier wrote: Hi Noel, *, I might be missing something - but a spreadsheet document is not a screencast video... doh!! but obviously I copied the wrong link http://users.freedesktop.org:8080/~noelp/zoom/zoomcast.ogv is what I meant for me the high bit rate "--v_bitrate 200" was necessary to smoothly capture mouse movements, Strange that the bitrate has impact - should have been the framerate.. But with low bitrate the image gets "muddy", so maybe that's what you meant. no really for me the main problem was it seemed not to pick up fast movements I can't recall exactly now whether it was additionally 'muddy', don't think it was but... [...] so.. onto the subtitles lots of google hits make me try 'aegisub' but this was a waste of time for me, just didn't work, Works excellent for me :-) - but may need a little time to get used to on how to define when a subtitle should be displayed (in other words on how to do timing) unfortunately aegisub really just didn't work, complained about no video provider ( or some error that sounded vaguely like that ). From looking around it appeared it should use ffmpeg but aegisub didn't see it and didn't provide a way for me to point it at it ( there was a box in the options for choosing a video provider but it was grayed out, there was also a config file I tried to hack all to no avail ) so I just gave up :-( [...] My key point is to not use a chain of lossless conversions, but only to do the lossless one as last step. as interesting as the arcade of options to the various tools above is ( thanks for posting them :-), sometime I will find the time to look at them more closely ) what I really was after was a way to go from ogv video +.srt file ( or .ass if you prefer ) -> ogv file with re-encoded subtitles ideally *without* the need to download restricted formats [*] not sure if the info above tells me that, I guess I need more time to study what's there more Noel [*] not that I am not adverse to downloading restricted codecs and the like but I tend to keep my work desktop machine clear of stuff from non-distro ( e.g. packman and the like ) repos that can cause zypper to complain about this version and that version of this and that conflicting etc. when upgrading installing etc. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtfimport/data/fdo52052.rtf |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c7d9febc31fecc2cfd7bfe28e987d010b8ad42e0
Author: Miklos Vajna
Date: Fri Nov 30 15:26:47 2012 +0100
sw: test a bit more in qa/extras
For this test document, the first paragraph is part of a textbox, when I
reduced the original bugdoc, I forgot about this.
Change-Id: Ia8d8aa5992d717a55c4115e4eb6d29f37e365df0
diff --git a/sw/qa/extras/rtfimport/data/fdo52052.rtf
b/sw/qa/extras/rtfimport/data/fdo52052.rtf
index 329762e..e58a64b 100644
--- a/sw/qa/extras/rtfimport/data/fdo52052.rtf
+++ b/sw/qa/extras/rtfimport/data/fdo52052.rtf
@@ -10,7 +10,7 @@
{\company Crystal Decisions}
}
\landscape\paperw16836\paperh11904\margl567\margr397\margt567\margb284\gutter0\windowctrl\ftnbj\viewkind1\viewscale100\sectd\linex0\sbknone
-{\pard first
+{\pard \pvpg\phpg\posx2007\posy597\absw12870\absh-900\fi0 \ltrpar\qc first
\par }
\page\sect
{\pard \pvpg\phpg\posx13152\posy612\absw2984\absh-210\fi0
\ltrpar\qr\tx360\tx720\tx1080\tx1440\tx1800\tx2160\tx2520\tx2880
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [API] Some more cleanup ideas
On 11/29/2012 06:44 PM, Thorsten Behrens wrote: Stephan Bergmann wrote: * a bit more extreme - kill ::com::sun::star inside office code, by having a ~global "using namespace ::com::sun::star;" or "namespace api = ::com::sun::star;" in e.g. sal/config.h, and writing only _that_ out in the generated c++ headers? (of course keep the old namespace for SDK. And yes, it's no new idea, just a bit less extreme as what's proposed in the wiki) namespace css = com::sun:.star is the de-facto standard there, so yes, I wouldn't mind using that in the generated headers. using namespace com::sun::star would save some 5 additional characters - let me see what a test build yields... ...but would increase potential for ambiguities. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/inc i18npool/source l10ntools/source scp2/source solenv/inc svtools/source
i18npool/inc/i18npool/lang.h |1 +
i18npool/source/isolang/isolang.cxx |1 +
l10ntools/source/ulfconv/msi-encodinglist.txt |1 +
scp2/source/ooo/module_helppack.ulf |6 ++
scp2/source/ooo/module_langpack.ulf |6 ++
solenv/inc/langlist.mk|1 +
svtools/source/misc/langtab.src |1 +
7 files changed, 17 insertions(+)
New commits:
commit 14569b316aec7b778caeeb55cba21af023dc4780
Author: Andras Timar
Date: Fri Nov 30 14:33:35 2012 +0100
add Sidama (sid) language
Change-Id: I7c7fb38d7df5aecda8e81443aa7045479e0efceb
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 2114fc6..cf4ec6b 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -565,6 +565,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_YAKA 0x0683
#define LANGUAGE_USER_YOMBE 0x0684
#define LANGUAGE_USER_YOMBE_CONGO 0x8284 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_USER_YOMBE)) */
+#define LANGUAGE_USER_SIDAMA0x0685
#define LANGUAGE_USER_SYSTEM_CONFIG 0xFFFE /* not a locale, to be
used only in configuration context to obtain system default, primary 0x3fe, sub
0x3f */
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx
b/i18npool/source/isolang/isolang.cxx
index ea2279b..439590a 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -510,6 +510,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_YAKA, "iyx", "CG" },
{ LANGUAGE_USER_YOMBE, "yom", "CD" },
{ LANGUAGE_USER_YOMBE_CONGO, "yom", "CG" },
+{ LANGUAGE_USER_SIDAMA,"sid", "ET" },
{ LANGUAGE_NONE, "zxx", "" }, // added to ISO
639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW,"", "" }// marks end of
table
};
diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt
b/l10ntools/source/ulfconv/msi-encodinglist.txt
index 113f4a4..7d88f08 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -134,6 +134,7 @@ sc 0 3047
sd 0 1113 # Sindhi
sh 0 2074 # Serbian Latin
si 0 2133
+sid 0 1669 # Sidama, fake LCID
sk 0 1051 # Slovak
sl 0 1060 # Slovenian
sq 0 1052 # Albanian
diff --git a/scp2/source/ooo/module_helppack.ulf
b/scp2/source/ooo/module_helppack.ulf
index 269054e..fd0e144 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -673,6 +673,12 @@ en-US = "Telugu"
[STR_DESC_MODULE_HELPPACK_TE]
en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
+[STR_NAME_MODULE_HELPPACK_SID]
+en-US = "Sidama"
+
+[STR_DESC_MODULE_HELPPACK_SID]
+en-US = "Installs Sidama help in %PRODUCTNAME %PRODUCTVERSION"
+
[STR_NAME_MODULE_HELPPACK_QTZ]
en-US = "KeyID"
diff --git a/scp2/source/ooo/module_langpack.ulf
b/scp2/source/ooo/module_langpack.ulf
index d321988..e8f25e6 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -685,6 +685,12 @@ en-US = "Amharic"
[STR_DESC_MODULE_LANGPACK_AM]
en-US = "Installs the Amharic user interface"
+[STR_NAME_MODULE_LANGPACK_SID]
+en-US = "Sidama"
+
+[STR_DESC_MODULE_LANGPACK_SID]
+en-US = "Installs the Sidama user interface"
+
[STR_NAME_MODULE_LANGPACK_QTZ]
en-US = "KeyID"
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 3f81446..9c28a90 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -110,6 +110,7 @@ sat \
sd \
sh \
si \
+sid \
sk \
sl \
sq \
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 1f1a73e..316b3d6 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -156,6 +156,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ;
< "Serbian Cyrillic (Montenegro)" ;
LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ;
< "Serbian Latin (Montenegro)" ;
LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ; > ;
+< "Sidama" ; LANGUAGE_USER_SIDAMA ; > ;
< "Sindhi" ; LANGUAGE_SINDHI ; > ;
< "Slovak" ; LANGUAGE_SLOVAK ; > ;
< "Slovenian" ; LANGUAGE_SLOVENIAN ; > ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 34465 - get rid of all calls to virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich)
Hi Bjoern, thanks for reply :) So, to change the conditionals, we need to make sure the state is > consistent. > Thus: > - adding the asserts > Do you mean DBG_ASSERT or real assert? How do debug those DBG_ASSERT, when compiling I don't get a lot of output. My command is make 2>&1 | tee build.log.all and autogen.lastrun --disable-gnome-vfs --without-doxygen --disable-mozilla --disable-binfilter --with-parallelism=3 --enable-debug --enable-dbgutil > Does that make sense? > I get the Idea, but I need to check some places in code. I will suspend all my other changes in SfxItemSet and first clean things with disabled items. I will post patches that it could be tested on other platforms. Best Regards, Maciek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - padmin/source svtools/inc unotools/inc vcl/inc
padmin/source/prtsetup.cxx| 30 +++---
padmin/source/rtsetup.src |1
svtools/inc/svtools/menuoptions.hxx |2 -
unotools/inc/unotools/cmdoptions.hxx |2 -
unotools/inc/unotools/defaultoptions.hxx |2 -
unotools/inc/unotools/dynamicmenuoptions.hxx |2 -
unotools/inc/unotools/extendedsecurityoptions.hxx |2 -
unotools/inc/unotools/fontoptions.hxx |2 -
unotools/inc/unotools/historyoptions.hxx |2 -
unotools/inc/unotools/internaloptions.hxx |2 -
unotools/inc/unotools/localisationoptions.hxx |2 -
unotools/inc/unotools/moduleoptions.hxx |2 -
unotools/inc/unotools/options.hxx |3 +-
unotools/inc/unotools/optionsdlg.hxx |2 -
unotools/inc/unotools/pathoptions.hxx |2 -
unotools/inc/unotools/printwarningoptions.hxx |2 -
unotools/inc/unotools/securityoptions.hxx |2 -
unotools/inc/unotools/syslocaleoptions.hxx|2 -
unotools/inc/unotools/useroptions.hxx |2 -
unotools/inc/unotools/viewoptions.hxx |2 -
unotools/inc/unotools/workingsetoptions.hxx |2 -
vcl/inc/vcl/jobdata.hxx |4 +-
vcl/inc/vcl/lstbox.hxx|1
23 files changed, 49 insertions(+), 26 deletions(-)
New commits:
commit 08597f2897e5ac752147c8f2c4a91bb557ed4580
Author: Caolán McNamara
Date: Fri Nov 30 14:04:12 2012 +
Related: fdo#44664 spadmin support for forcing "postscript of driver level"
pdf of 0 and ps of 0 == automatically pick pdf if pdf is default backend.
Which means that spadmin wasn't able to disable pdf if one selected
"postscript of driver leve", though picking an explicit postscript level
would work.
So we need to tweak things to use the pdf flag to be either automatic,
explicitly pdf or explicitly ps
Change-Id: Ic5382a3eb9cbcff39d363723825e75851d73520e
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 936322b..3862cde 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -26,6 +26,8 @@
#include "osl/thread.h"
+#include
+
#define LSCAPE_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Landscape" ) )
#define PORTRAIT_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Portrait" ) )
@@ -381,11 +383,25 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
case 1: m_aSpaceBox.SelectEntry( m_aSpaceColor );break;
}
-sal_uLong nLevelEntryData = 0;
-if( m_pParent->m_aJobData.m_nPDFDevice > 0 )
+sal_uLong nLevelEntryData = 0; //automatic
+if( m_pParent->m_aJobData.m_nPDFDevice == 2 ) //explicitly PDF
nLevelEntryData = 10;
-else
+else if (m_pParent->m_aJobData.m_nPSLevel > 0) //explicit PS Level
nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
+else if (m_pParent->m_aJobData.m_nPDFDevice == 1) //automatically PDF
+nLevelEntryData = 0;
+else if (m_pParent->m_aJobData.m_nPDFDevice == -1) //explicitly PS from
driver
+nLevelEntryData = 1;
+
+bool bAutoIsPDF =
officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get();
+
+assert(nLevelEntryData != 0 || bAutoIsPDF ==
m_pParent->m_aJobData.m_nPDFDevice);
+
+OUString sStr = m_aLevelBox.GetEntry(0);
+m_aLevelBox.InsertEntry(sStr.replaceAll("%s", bAutoIsPDF ?
m_aLevelBox.GetEntry(5) : m_aLevelBox.GetEntry(1)), 0);
+m_aLevelBox.SetEntryData(0, m_aLevelBox.GetEntryData(1));
+m_aLevelBox.RemoveEntry(1);
+
for( sal_uInt16 i = 0; i < m_aLevelBox.GetEntryCount(); i++ )
{
if( (sal_uLong)m_aLevelBox.GetEntryData( i ) == nLevelEntryData )
@@ -435,6 +451,8 @@ void RTSDevicePage::update()
sal_uLong RTSDevicePage::getLevel()
{
sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData(
m_aLevelBox.GetSelectEntryPos() );
+if (nLevel == 0)
+return 0; //automatic
return nLevel < 10 ? nLevel-1 : 0;
}
@@ -443,7 +461,11 @@ sal_uLong RTSDevicePage::getLevel()
sal_uLong RTSDevicePage::getPDFDevice()
{
sal_uLong nLevel = (sal_uLong)m_aLevelBox.GetEntryData(
m_aLevelBox.GetSelectEntryPos() );
-return nLevel > 9 ? 1 : 0;
+if (nLevel > 9)
+return 2; //explictly PDF
+else if (nLevel == 0)
+return 0; //automatic
+return -1; //explicitly PS
}
// --
diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index 0e5e1d3..b75a1a3 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.src
@@ -186,6 +186,7 @@ TabPage RID_RTS_DEVICEPAGE
Size = MAP_APPFONT( 105, 200 );
StringList [en-US] =
{
+< "Automatic : %s" ; 0; > ;
< "PostScript (Level from driver)" ; 1; > ;
< "PostScript L
Re: Java/SWING + VCL / X crasher ...
Hi Andrew, On Fri, 2012-11-30 at 11:29 +, Andrew Haley wrote: > Fixed thusly, We'll see what the AWT devs say. Thanks so much; sorry it took such an awkward setup to debug. ATB, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/odma/odma_content.cxx | 16 ++--
ucb/source/ucp/odma/odma_content.hxx |4 ++--
ucb/source/ucp/odma/odma_datasupplier.cxx |3 ++-
ucb/source/ucp/odma/odma_provider.cxx |2 +-
4 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit 7369ac227531330b96981359c6e346da1c0e1bd1
Author: Noel Grandin
Date: Fri Nov 30 15:56:27 2012 +0200
fix build on windows in ucb/source/ucp/odma/*
because I messed up the UNO changes in
commit 58e9686da63f8082c5d3078745a8ed89f0d79b4d.
Change-Id: I0d2a9dc1c33009c963bc13301dafbbc69e15a1da
diff --git a/ucb/source/ucp/odma/odma_content.cxx
b/ucb/source/ucp/odma/odma_content.cxx
index be1e48f..0789bd6 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -31,7 +31,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -66,11 +65,11 @@ using namespace odma;
//=
//=
-Content::Content( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier,
const ::rtl::Reference& _rProps)
-: ContentImplHelper( rxSMgr, pProvider, Identifier )
+: ContentImplHelper( rxContext, pProvider, Identifier )
,m_aProps(_rProps)
,m_pProvider(pProvider)
,m_pContent(NULL)
@@ -310,7 +309,7 @@ uno::Any SAL_CALL Content::execute(
// open as folder - return result set
uno::Reference< ucb::XDynamicResultSet > xSet
-= new DynamicResultSet(
comphelper::getComponentContext(m_xSMgr),
+= new DynamicResultSet( m_xContext,
this,
aOpenCommand,
Environment );
@@ -341,9 +340,7 @@ uno::Any SAL_CALL Content::execute(
rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
rtl::OUString sFileURL = openDoc();
delete m_pContent;
-m_pContent = new ::ucbhelper::Content
-(sFileURL,NULL,
- comphelper::getComponentContext(m_xSMgr));
+m_pContent = new ::ucbhelper::Content( sFileURL, NULL, m_xContext
);
if(!m_pContent->isDocument())
{
rtl::OUString sErrorMsg("File: ");
@@ -501,8 +498,7 @@ uno::Any SAL_CALL Content::execute(
sal_Int32 nLastIndex = sFileURL.lastIndexOf( sal_Unicode('/') );
// Create a new Content object for the "shadow" file
// corresponding to the opened document from the DMS.
-::ucbhelper::Content aContent(sFileURL.copy(0,nLastIndex),NULL,
-
comphelper::getComponentContext(m_xSMgr));
+::ucbhelper::Content aContent(sFileURL.copy(0,nLastIndex),NULL,
m_xContext);
// aTransferInfo.NameClash = ucb::NameClash::OVERWRITE;
aTransferInfo.NewTitle = sFileURL.copy( 1 + nLastIndex );
// Copy our saved backup copy to the "shadow" file.
@@ -768,7 +764,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Reference< ucb::XCommandEnvironment >& /*xEnv*/ )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
-return getPropertyValues( comphelper::getComponentContext(m_xSMgr),
+return getPropertyValues( m_xContext,
rProperties,
m_aProps,
rtl::Reference<
diff --git a/ucb/source/ucp/odma/odma_content.hxx
b/ucb/source/ucp/odma/odma_content.hxx
index 1741d11..2160887 100644
--- a/ucb/source/ucp/odma/odma_content.hxx
+++ b/ucb/source/ucp/odma/odma_content.hxx
@@ -120,7 +120,7 @@ private:
public:
Content( const ::com::sun::star::uno::Reference<
-::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+::com::sun::star::uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier,
@@ -172,7 +172,7 @@ public:
// Called from resultset data supplier.
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
getPropertyValues( const ::com::sun::star::uno::Reference<
-::com::sun::star::lang::XMultiServiceFactory >& rSMgr,
+::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence<
::com::sun::star::be
[Libreoffice-commits] .: 2 commits - connectivity/source extensions/source
connectivity/source/manager/mdrivermanager.hxx |8 +++-
extensions/source/bibliography/bibload.cxx |5 -
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 27520df57c887488ff4fd5580a9e932f67bd3976
Author: Stephan Bergmann
Date: Fri Nov 30 14:56:03 2012 +0100
fdo#57696: Missing adaption of OSDBCDriverManager to XDriverManager2
Change-Id: Icce6ab9d6d815e9aff4980fadab71a4197593e0e
diff --git a/connectivity/source/manager/mdrivermanager.hxx
b/connectivity/source/manager/mdrivermanager.hxx
index 2cd7078..87b145d 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -20,15 +20,14 @@
#ifndef _CONNECTIVITY_DRIVERMANAGER_HXX_
#define _CONNECTIVITY_DRIVERMANAGER_HXX_
-#include
+#include
#include
-#include
#include
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -55,9 +54,8 @@ namespace drivermanager
//==
//= OSDBCDriverManager - the one-instance service for managing SDBC drivers
//==
-typedef ::cppu::WeakImplHelper5 < ::com::sun::star::sdbc::XDriverManager
+typedef ::cppu::WeakImplHelper4 < ::com::sun::star::sdbc::XDriverManager2
, ::com::sun::star::sdbc::XDriverAccess
-,
::com::sun::star::container::XEnumerationAccess
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::uno::XNamingService
> OSDBCDriverManager_Base;
commit f6cf7115599a713db7cd177fa87dbce7cc883810
Author: Stephan Bergmann
Date: Fri Nov 30 14:53:38 2012 +0100
Add a SAL_INFO
Change-Id: Icca6e25a7c9de408570bf5ceb88aefea692cdc8d
diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
index f0ff55a..2436791 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -245,8 +245,11 @@ namespace
// and the bibliography is assumed to work
return
com::sun::star::sdbc::DriverManager::create(comphelper::getProcessComponentContext()).is();
}
-catch(...)
+catch (Exception & e)
{
+SAL_INFO(
+"extensions.bibliography",
+"assuming Base to be missing; caught " << e.Message);
return false;
}
}
___
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 Petr Mladek changed: What|Removed |Added Depends on|57710 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failures of LO master on openSUSE
No, but I did use autogen (...) --without-help And to be more precise: building works, but "make dev-install" fails, even on a freshly cloned tree. 2012/11/30 Eike Rathke > Hi Stephan, > > On Wednesday, 2012-11-28 15:21:32 +0100, Stephan van den Akker wrote: > > > : WARNING: Source for swriter_en-US.zip not found! > > : WARNING: Source for swriter_en-US.zip not found! > > : WARNING: Using swriter_en-US.zip instead of swriter_en-US.zip was not > > successful > > > > Looks to me like some i18n files are missing. Anyone have an idea how to > > solve this? > > Missing files are help content, e.g. should be built in > ./helpcontent2/unxlngx6.pro/bin/swriter_en-US.zip > > and delivered to > ./solver/unxlngx6.pro/pck/swriter_en-US.zip > > Did you by chance configure --without-helppack-integration ? > > Eike > > -- > LibreOffice Calc developer. Number formatter stricken i18n > transpositionizer. > GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD > Support the FSFE, care about Free Software! > https://fsfe.org/support/?erack > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Petr Mladek changed: What|Removed |Added Depends on|56939 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build failures of LO master on openSUSE
Hi Stephan, On Wednesday, 2012-11-28 15:21:32 +0100, Stephan van den Akker wrote: > : WARNING: Source for swriter_en-US.zip not found! > : WARNING: Source for swriter_en-US.zip not found! > : WARNING: Using swriter_en-US.zip instead of swriter_en-US.zip was not > successful > > Looks to me like some i18n files are missing. Anyone have an idea how to > solve this? Missing files are help content, e.g. should be built in ./helpcontent2/unxlngx6.pro/bin/swriter_en-US.zip and delivered to ./solver/unxlngx6.pro/pck/swriter_en-US.zip Did you by chance configure --without-helppack-integration ? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpxENiYzy7Xs.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/PropertyMap.cxx | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 3f13a8255be93cd3b697f42d691b35418eb87114
Author: Miklos Vajna
Date: Fri Nov 30 13:18:07 2012 +0100
dmapper: couple of null pointer checks for the unit test
Change-Id: Ie0b12f416da2dda95fdb4e46482a50fee0245ffe
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 5a90e50..c2fe9ef 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -788,13 +788,13 @@ void SectionPropertyMap::PrepareHeaderFooterProperties(
bool bFirstPage )
uno::Reference lcl_GetRangeProperties(bool
bIsFirstSection, DomainMapper_Impl& rDM_Impl, uno::Reference
xStartingRange)
{
uno::Reference< beans::XPropertySet > xRangeProperties;
-if (bIsFirstSection)
+if (bIsFirstSection && rDM_Impl.GetBodyText().is())
{
uno::Reference
xEnumAccess(rDM_Impl.GetBodyText(), uno::UNO_QUERY_THROW);
uno::Reference xEnum =
xEnumAccess->createEnumeration();
xRangeProperties =
uno::Reference(xEnum->nextElement(), uno::UNO_QUERY_THROW);
}
-else
+else if (xStartingRange.is())
xRangeProperties = uno::Reference(xStartingRange,
uno::UNO_QUERY_THROW);
return xRangeProperties;
}
@@ -839,7 +839,8 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
if( m_nColumnCount > 0 && xSection.is())
ApplyColumnProperties( xSection );
uno::Reference
xRangeProperties(lcl_GetRangeProperties(m_bIsFirstSection, rDM_Impl,
m_xStartingRange));
-
xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME),
uno::makeAny(m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName));
+if (xRangeProperties.is())
+
xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_PAGE_DESC_NAME),
uno::makeAny(m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName));
}
// If the section is of type "New column" (0x01), then simply insert a
column break.
// But only if there actually are columns on the page, otherwise a column
break
@@ -999,8 +1000,11 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
/* break type
0 - No break 1 - New Colunn 2 - New page 3 - Even page 4 - odd
page */
if ((m_bTitlePage && m_bIsFirstSection) || !m_bTitlePage)
-
xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_PAGE_DESC_NAME ),
-uno::makeAny( m_bTitlePage ? m_sFirstPageStyleName
: m_sFollowPageStyleName ));
+{
+if (xRangeProperties.is())
+
xRangeProperties->setPropertyValue(rPropNameSupplier.GetName(
PROP_PAGE_DESC_NAME ),
+uno::makeAny( m_bTitlePage ?
m_sFirstPageStyleName : m_sFollowPageStyleName ));
+}
else
{
// In this miserable situation (second or later section on
a title page), make sure that the header / footer is not lost.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Petr Mladek changed: What|Removed |Added Depends on|35669 | -- 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] .: oox/source
oox/source/export/drawingml.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 28315fb6a40dd0f43990272b11037f60d26afda7 Author: Radek Doulik Date: Fri Nov 30 14:18:32 2012 +0100 do not write rotation when it is equal to multiple of 360 degrees Change-Id: I0338964e8f8ded9ce0c488a437d3bf023d08047a diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 3f141e5..ae9f1b3 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -617,7 +617,7 @@ void DrawingML::WriteTransformation( const Rectangle& rRect, mpFS->startElementNS( nXmlNamespace, XML_xfrm, XML_flipH, bFlipH ? "1" : NULL, XML_flipV, bFlipV ? "1" : NULL, - XML_rot, nRotation ? I32S( nRotation ) : NULL, + XML_rot, (nRotation % 2160) ? I32S( nRotation ) : NULL, FSEND ); mpFS->singleElementNS( XML_a, XML_off, XML_x, IS( MM100toEMU( rRect.Left() ) ), XML_y, IS( MM100toEMU( rRect.Top() ) ), FSEND ); ___ 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 Petr Mladek changed: What|Removed |Added Depends on|57698 | -- 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] .: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk
offapi/UnoApi_offapi.mk|5 -
offapi/com/sun/star/ucb/Cookie.idl | 69
offapi/com/sun/star/ucb/CookiePolicy.idl | 51 ---
offapi/com/sun/star/ucb/CookieRequest.idl | 47 --
offapi/com/sun/star/ucb/HandleCookiesRequest.idl | 55
offapi/com/sun/star/ucb/XInteractionCookieHandling.idl | 73 -
offapi/type_reference/types.rdb|binary
7 files changed, 300 deletions(-)
New commits:
commit 04553f43e8bf12c8ecbbfb24f87199767c34c4f4
Author: Michael Stahl
Date: Fri Nov 30 14:01:04 2012 +0100
API CHANGE: remove com.sun.star.ucb.Cookie related API
The implementation behind these types was removed in LibreOffice 3.6,
for bug fdo#48870.
com.sun.star.ucb.Cookie
com.sun.star.ucb.CookiePolicy
com.sun.star.ucb.CookieRequest
com.sun.star.ucb.HandleCookiesRequest
com.sun.star.ucb.XInteractionCookieHandling
EXISTENCE: published key "/UCR/com/sun/star/ucb/CookieRequest" exists
only in registry 1
EXISTENCE: published key
"/UCR/com/sun/star/ucb/XInteractionCookieHandling" exists only in
registry 1
EXISTENCE: published key "/UCR/com/sun/star/ucb/HandleCookiesRequest"
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/ucb/Cookie" exists only in
registry 1
EXISTENCE: published key "/UCR/com/sun/star/ucb/CookiePolicy" exists
only in registry 1
Change-Id: Ia7516eda8913aa721da386882543adaddbba7e2f
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 7311622..4f5af08 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3701,9 +3701,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
ContentInfoAttribute \
ContentProviderInfo \
ContentResultSetCapability \
- Cookie \
- CookiePolicy \
- CookieRequest \
CrossReference \
DocumentHeaderField \
DocumentStoreMode \
@@ -3719,7 +3716,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
FolderListEntry \
GlobalTransferCommandArgument \
GlobalTransferCommandArgument2 \
- HandleCookiesRequest \
IOErrorCode \
IllegalIdentifierException \
InsertCommandArgument \
@@ -3827,7 +3823,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
XFetchProvider \
XFetchProviderForContentAccess \
XFileIdentifierConverter \
- XInteractionCookieHandling \
XInteractionHandlerSupplier \
XInteractionReplaceExistingData \
XInteractionSupplyAuthentication \
diff --git a/offapi/com/sun/star/ucb/Cookie.idl
b/offapi/com/sun/star/ucb/Cookie.idl
deleted file mode 100644
index fd8da0d..000
--- a/offapi/com/sun/star/ucb/Cookie.idl
+++ /dev/null
@@ -1,69 +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 .
- */
-#ifndef __com_sun_star_ucb_Cookie_idl__
-#define __com_sun_star_ucb_Cookie_idl__
-
-#include
-#include
-
-
-
-module com { module sun { module star { module ucb {
-
-/** A cookie.
-@deprecated
-*/
-published struct Cookie
-{
-/** The name of the cookie.
-*/
-string Name;
-
-/** The value of the cookie.
-*/
-string Value;
-
-/** The domain to which the cookie applies.
-*/
-string Domain;
-
-/** The path to which the cookie applies.
-*/
-string Path;
-
-/** The date the cookie will expire.
-*/
-com::sun::star::util::DateTime Expires;
-
-/** Whether the requested action should be performed in a secure fashion.
-*/
-boolean Secure;
-
-/** The policy for handling this cookie in the future.
-*/
-com::sun::star::ucb::CookiePolicy Policy;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/ucb/CookiePolicy.idl
b/offapi/com/sun/star/ucb/CookiePolicy.idl
deleted file mode 100644
index 6f9c2e8..000
--- a/offapi/com/sun/star/ucb/CookiePolicy.idl
+++ /
Re: screencast instructions
Hi Noel, *,
On Thu, Nov 29, 2012 at 5:36 PM, Noel Power wrote:
> I was asked by a number of people about how I created
> http://users.freedesktop.org:8080/~noelp/zoom/JumpingAnchoredShapes.ods
I might be missing something - but a spreadsheet document is not a
screencast video...
> and in particular the captions/subtitles.
> [...]
> I used recordmydesktop ( available from all good linux distros ), my
> commandline was something like
>
>recordmydesktop --v_bitrate 200 -o zoom.ogv ( cntrl-c when finished
> and it will dump the .ogv file )
with gnome3 one ould use the builtin gstreamer-pipeline with
+++r to record the desktop, if you want more
control, something like this:
Alternatively capturing "manually" one can use lossless encodings:
ffmpeg -loglevel warning -f x11grab -r 15 -s ${WIDTH}x$HEIGHT -i
:0.0+$POS_X,$POS_Y -f yuv4mpegpipe -pix_fmt yuv420p - | x264 --demuxer
y4m --preset veryfast --qp 0 -o output.mkv -
x264's lossless mode is quite effective for screencasts. get
dimensions and position of the window to record with "xwininfo -frame"
or just grab the whole area and cut afterwards..
the ffmpeg options explained:
"-loglevel warning" just be more quiet
"-f x11grab" capture the screen
"-r 15" with a framerate of 15 fps (feel free to use bigger values)
"-s ${WIDHT}x$HEIGHT" capture an area that is that large
"-i :0.0+$POS_X,$POS_Y" the "source" for the x11grab is on Display
:0.0 and starts at offset $POS_X,$POS_Y
"-f yuv4mpegpipe" the output format is yuv4mpeg
"-pix_fmt yuv420p" convert from the X-Servers RGB colorspace to yuv for h264
"-" output to stdout for piping into the encoder
the x264 options explained:
"--demuxer y4m" what is fed on stdin is yuv4mpeg
"--preset veryfast" use the veryfast preset - tradeoffs encoding speed
vs filesize, but as we're generating lossless video, we can use a
slower preset afterwards for the final result - just make sure you use
a preset that is fast enough for real-time encoding.
"--qp 0" switch to lossless mode
"-o output.mkv" write to file output.mkv
"-" and read from stdin
> for me the high bit rate "--v_bitrate 200" was necessary to smoothly
> capture mouse movements,
Strange that the bitrate has impact - should have been the framerate..
But with low bitrate the image gets "muddy", so maybe that's what you
meant. Then again: Using a lossless format doesn't have this problems.
Capture lossless, then convert to whatever other target format would
be my suggestion.
> [...]
> so.. onto the subtitles lots of google hits make me try 'aegisub' but this
> was a waste of time for me, just didn't work,
Works excellent for me :-) - but may need a little time to get used to
on how to define when a subtitle should be displayed (in other words
on how to do timing)
> So, basically with subtitles you can either
> deliver them with a separate file ( the .srt file previously mentioned or
> there apparently is another popular caption/subtitle format '.ass' - I kid
> you not!!! )
ASS is "*A*dvanced *S*ub*S*tation alpha" format. And that's the format
of choice if you want to use any kind of effects (text fade in/out,
text rotation, shearing, drawing objects, etc)
> [...] I wanted to actually have the
> subtitles encoded in the video stream itself and the only way I found to do
> that which worked ( to actually re-encode subtitles into the video stream )
> was to use mencoder. [...]
>
>mencoder zoom.ogv -o output-zoom.avi -ovc lavc -lavcopts acodec=ac3 -oac
> mp3lame -sub zoom.srt -lavcopts vbitrate=2400
As you mentioned, you're pointlessly converting to lossy formats.
I suggest to use mplayer and pipe into the actual encoder (or use
ffmpeg, that is the "throw whatever you like at it" solution)
mplayer -nosound -benchmark -vo yuv4mpeg:file=>(x264 --demuxer y4m
--crf 20 --output output.mkv - 2>/tmp/x264.log) input.mkv
Options explained:
"-nosound" don't output any sound
"-benchmark" ignore the framerate, but decode frames as-fast-as-possible
"-vo yuv4mpeg:file=>(.)" output to yuv4mpeg and pipe the output to
the x264 command
"input.mkv" the file to read
x264 option explained:
"--crf 20" instead of using lossless mode, use constant-quality mode
with a factor of 20 (lower values=better quality, but larger files, it
doesn't make sense to go lower than 18)
But you don't have to use x264 of course, you can use ffmpeg or other
tools in a similar fashion.
My key point is to not use a chain of lossless conversions, but only
to do the lossless one as last step.
> [...]
ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Base unit tests
On Sat, Nov 03, 2012 at 11:09:52AM +0100, David Ostrovsky wrote: > On 03.11.2012 10:00, Lionel Elie Mamane wrote: > I pushed a complete unit test for ado driver (based on mdb files > that was attached to this issue). > For all file based drivers it would be trivially to add a mandatory > unit test to the build process. > For not file based drivers, we can provide environment driven unit tests: > some system wide properties must be exposed to run it, > like data source name, url, usr, pwd, etc. > User interface for these manuall unit test would be driver specific > make targets, i. e. > Sounds like a plan? Yes, that sounds very nice! There should also be the way to run a driver-agnostic unittest against one or multiple drivers, e.g. by providing the SDBC URL(s) and the username/password (if any). -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 34465 - get rid of all calls to virtual const SfxPoolItem* Put( const SfxPoolItem&, USHORT nWhich)
On Thu, Nov 22, 2012 at 08:52:20AM +0100, Maciej Rumianowski wrote: > I have hit a problem that i don't fully understand. Disabled items are > SfxVoidItem with Which 0, but inserted with different one. State of Item is > check with TYPE Macro as below > > > if ( (*ppFnd)->Type() == TYPE(SfxVoidItem) ) > > return SFX_ITEM_DISABLED; > > > > So it just type that decides about disabled state of item. I've changed > places where conditions like > > > if( !(*ppFnd)->Which() ) > > > to > > > if ( (*ppFnd)->ISA(SfxVoidItem) ) Yes, there are quite a few evil cornercases lurking there. Before changing those conditionals, I think it is a good idea to just add assertions that make sure these assumptions are kept consistent all the time. A start would be to check that when an item is put in the set, to check: - If it has a non-zero Which-Id - and is not a SfxVoidItem any client code that does something different (even explicitly putting a SfxVoidItem), is abusing the API and should be fixed by making it call DisableItem instead). Once you are sure that is cleaned up, one can carefully go on about changing the conditions. Some care is still needed as in theory, someone might have e.g. put a non-zero, non-SfxVoidItem and later set the WhichId on the item to 0. Of course, we then need to send out a team to hunt down those responsible and whack them with a large trout in their sleep, if we ever come across such a case. So, to change the conditionals, we need to make sure the state is consistent. Thus: - adding the asserts - run e.g. subsequentcheck to see if they every pop something up After that: Carefully start migrating the conditionals. Does that make sense? Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#57611 do not crash when setting too small size
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1197 -- To view, visit https://gerrit.libreoffice.org/1197 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ae2048a6c0acc6b6cf2beece9e630c87caac39f Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane Gerrit-Reviewer: Lionel Elie Mamane Gerrit-Reviewer: Stephan Bergmann ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - reportdesign/source
reportdesign/source/core/inc/ReportHelperImpl.hxx | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
New commits:
commit b14f981e055bde9243c82d3ca5bbd3e469a7eb40
Author: Lionel Elie Mamane
Date: Thu Nov 29 16:35:14 2012 +0100
fdo#57611 do not crash when setting too small size
setWidth/setHeight's exception specifications are lacking,
but fixing this in a stable release line is too invasive:
they are "inherited" from the specification in
offapi/com/sun/star/report/XReportComponent.idl
and are thus part of our public API.
Change-Id: I8ae2048a6c0acc6b6cf2beece9e630c87caac39f
Signed-off-by: Stephan Bergmann
diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx
b/reportdesign/source/core/inc/ReportHelperImpl.hxx
index 1b5f7d2..6325f8f 100644
--- a/reportdesign/source/core/inc/ReportHelperImpl.hxx
+++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx
@@ -46,7 +46,14 @@ void SAL_CALL clazz::setHeight( ::sal_Int32 _height ) throw
(uno::RuntimeExcepti
{ \
awt::Size aSize = getSize(); \
aSize.Height = _height; \
-setSize(aSize); \
+try \
+{ \
+setSize(aSize); \
+} \
+catch (const beans::PropertyVetoException &) \
+{ \
+throw uno::RuntimeException("Unacceptable height",
static_cast(this)); \
+} \
} \
::sal_Int32 SAL_CALL clazz::getPositionX() throw (uno::RuntimeException) \
{ \
@@ -76,7 +83,14 @@ void SAL_CALL clazz::setWidth( ::sal_Int32 _width ) throw
(uno::RuntimeException
{ \
awt::Size aSize = getSize(); \
aSize.Width = _width; \
-setSize(aSize); \
+try \
+{ \
+setSize(aSize); \
+} \
+catch (const beans::PropertyVetoException &) \
+{ \
+throw uno::RuntimeException("Unacceptable width",
static_cast(this)); \
+} \
} \
uno::Reference< report::XSection > SAL_CALL clazz::getSection() throw
(uno::RuntimeException) \
{ \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: split qnametostr up to try and make .o's small enough for pp...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1201 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1201/1 split qnametostr up to try and make .o's small enough for ppc64 i.e. relocation truncated to fix: R_PPC64_TOC16_DS while I'm at it merge the standalone header/footer files into the .xslt and simplify the makefile. (cherry picked from commit 4ee0ee4971119b0460fc3e7819a23acd34202dc4) Conflicts: writerfilter/CustomTarget_source.mk writerfilter/source/resourcemodel/qnametostrfooter Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 --- M writerfilter/CustomTarget_source.mk M writerfilter/Library_writerfilter.mk M writerfilter/source/doctok/qnametostr.xsl M writerfilter/source/ooxml/qnametostr.xsl A writerfilter/source/resourcemodel/qnametostrcore.cxx D writerfilter/source/resourcemodel/qnametostrfooter D writerfilter/source/resourcemodel/qnametostrheader 7 files changed, 98 insertions(+), 109 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1201 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee0e9b5dd96868f49f1bed22fb5dc6d28c8cef81 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/localize.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit af06afdbe8c61604b4498ce1e11660dd3b647dcc
Author: Andras Timar
Date: Fri Nov 30 12:36:44 2012 +0100
there is nothing to localize in 'scripting' module
Change-Id: I093e13218dce5d7d73841b34af15f001122e0259
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index c1f9e8c..c4ed537 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -365,7 +365,6 @@ bool includeProject(OString const & project) {
"scaddins",
"sccomp",
"scp2",
-"scripting",
"sd",
"sdext",
"setup_native",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
