[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 71667, which changed state.

Bug 71667 Summary: EDITING: Function wizard delete the outer functions in a 
formula while editing an inner one.
https://bugs.freedesktop.org/show_bug.cgi?id=71667

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

[Jürgen Schmidt]

 sd/source/filter/ppt/pptin.cxx |  276 -
 1 file changed, 141 insertions(+), 135 deletions(-)

New commits:
commit d44e9a9244558f63b3feaf923802ed32b4931283
Author: Jürgen Schmidt j...@apache.org
Date:   Thu Dec 5 08:02:59 2013 +

#123789# ppt import, if sub address is no document internal link, take it 
as it is

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index f1c2261..47ed4737 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -87,7 +87,7 @@
 #include editeng/editstat.hxx
 #include unotools/pathoptions.hxx
 #include sfx2/docfac.hxx
-#define MAX_USER_MOVE   2
+#define MAX_USER_MOVE2
 
 #include pptinanimations.hxx
 #include ppt97animations.hxx
@@ -170,16 +170,16 @@ SdPPTImport::~SdPPTImport()
 }
 
 ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage 
rStorage_, SfxMedium rMedium, PowerPointImportParam rParam )
-:   SdrPowerPointImport ( rParam, rMedium.GetBaseURL() )
-,   mrMed   ( rMedium )
-,   mrStorage   ( rStorage_ )
-,   mbDocumentFound ( sal_False )
-,   mnFilterOptions ( 0 )
+:SdrPowerPointImport ( rParam, rMedium.GetBaseURL() )
+,mrMed( rMedium )
+,mrStorage( rStorage_ )
+,mbDocumentFound( sal_False )
+,mnFilterOptions( 0 )
 {
 mpDoc = pDocument;
 if ( bOk )
 {
-mbDocumentFound = SeekToDocument( maDocHd );  
 // maDocHd = the latest DocumentHeader
+mbDocumentFound = SeekToDocument( maDocHd );  
   // maDocHd = the latest DocumentHeader
 while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, maDocHd ) )
 mbDocumentFound = sal_True;
 
@@ -294,10 +294,10 @@ sal_Bool ImplSdPPTImport::Import()
 aPropItem  nSlideCount;
 if ( nSlideCount  pSection-GetProperty( 
PID_HEADINGPAIR, aPropItem ) )
 {
-sal_uInt32  nSlideTitleIndex = 0, nSlideTitleCount = 0;
-sal_uInt32  nFontIndex, nFontCount = 0;
-sal_uInt32  nDesignTemplateIndex, nDesignTemplateCount 
= 0;
-sal_uInt32  i, nTemp, nEntryCount = 0;
+sal_uInt32nSlideTitleIndex = 0, nSlideTitleCount = 
0;
+sal_uInt32nFontIndex, nFontCount = 0;
+sal_uInt32nDesignTemplateIndex, 
nDesignTemplateCount = 0;
+sal_uInt32i, nTemp, nEntryCount = 0;
 
 String aUString;
 
@@ -441,7 +441,7 @@ sal_Bool ImplSdPPTImport::Import()
 for( nToken = 0; nToken  
nTokenCount; nToken++ )
 aStringAry[ nToken ] = 
ByteString( aString.GetToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8 
);
 
-sal_Bool bSucceeded = sal_False;
+sal_Bool bDocInternalSubAddress = 
sal_False;
 
 // first pass, searching for a 
SlideId
 for( nToken = 0; nToken  
nTokenCount; nToken++ )
@@ -458,30 +458,29 @@ sal_Bool ImplSdPPTImport::Import()
 if ( nPage != 
PPTSLIDEPERSIST_ENTRY_NOTFOUND )
 {
 nPageNumber = 
nPage;
-bSucceeded = 
sal_True;
+
bDocInternalSubAddress = sal_True;
 break;
 }
 }
 }
 }
 }
-if ( !bSucceeded )
+if ( !bDocInternalSubAddress )
 {   // second pass, searching for 
a SlideName
 for ( nToken = 0; nToken  
nTokenCount; nToken++ )
 {
-String aToken( 
aString.GetToken( nToken, (sal_Unicode)',' ) );
 for ( void* pPtr = 
maSlideNameList.First(); pPtr; pPtr = maSlideNameList.Next() )
 {
-if ( *(String*)pPtr == 

[Libreoffice-commits] core.git: cppcanvas/source

[Jan Holesovsky]

 cppcanvas/source/mtfrenderer/emfplus.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb45c69b64ef19a33e4c04c6eba3733f18f8b5fc
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 5 09:07:44 2013 +0100

EMF+: Log the stride too.

Change-Id: I903d8e5629c578f292307bf3abdb2f58ef9dd92c

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index ccb8bd6..722d23f 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -959,7 +959,7 @@ namespace cppcanvas
 
 if (type == 1) { // bitmap
 s  width  height  stride  pixelFormat  unknown;
-SAL_INFO(cppcanvas.emf, EMF+\tbitmap width:   width 
  height:   height   stride:   pixelFormat: 0x  std::hex  
pixelFormat  std::dec);
+SAL_INFO(cppcanvas.emf, EMF+\tbitmap width:   width 
  height:   height   stride:   stride   pixelFormat: 0x  
std::hex  pixelFormat  std::dec);
 if (width == 0) { // non native formats
 GraphicFilter filter;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/wrtw8nds.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e82f6024f3380403f858e58383bfa4e6540110ef
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 09:16:22 2013 +0100

-Werror=uninitialized

Change-Id: I3ad9cad8a19eceec1b6a86a0210f4a6d0fa9bf0b

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 6899165..9fd7336 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -393,7 +393,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 const SvxFontItem rParentFont = ItemGetSvxFontItem(
 (const SwTxtFmtColl)rNd.GetAnyFmtColl(), nFontId);
 const SvxFontItem *pFont = rParentFont;
-const SfxPoolItem *aGrabBag;
+const SfxPoolItem *pGrabBag = 0;
 
 SfxItemSet aExportSet(*rNd.GetSwAttrSet().GetPool(),
 RES_CHRATR_BEGIN, RES_TXTATR_END - 1);
@@ -438,7 +438,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 if (nWhichId == nFontId)
 pFont = (item_castSvxFontItem(*pItem));
 else if (nWhichId == RES_CHRATR_GRABBAG)
-aGrabBag = pItem;
+pGrabBag = pItem;
 else
 aRangeItems[nWhichId] = pItem;
 }
@@ -515,7 +515,8 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
 }
 
 // Output grab bag attributes
-m_rExport.AttrOutput().OutputItem( *aGrabBag );
+if (pGrabBag)
+m_rExport.AttrOutput().OutputItem( *pGrabBag );
 }
 
 void SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Navigation buttons in Writer Search bar

[Samuel Mehrbrodt]

Hi,

I'm trying to add the Navigation buttons that were below the scrollbar 
in Writer to the Search bar, as discussed on UX-Advise.


Now I have the Next and Previous buttons working, but have two 
questions:


- How can I display an Image instead of text in the toolbar?
- I have a new Uno Command for showing the Navigation window 
(uno:NavigationPopup) and I catch it in sw/source/ui/uiview/view2.cxx. 
Now I need to implement something like [1] (new SwScrollNaviPopup ...). 
Where should I implement this? It doesn't seem right to me to do it 
directly in view2.cxx.


Thanks
Samuel

[1] 
http://cgit.freedesktop.org/libreoffice/core/diff/sw/source/ui/ribbar/workctrl.cxx?id=3e8fe4d8e19be2ccd8f5bb898530e2f615a90321 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: I have some questions for libreoffice development.

[Miklos Vajna]

Hi,

As requested earlier, please don't drop the list from CC, that's
considered rude. Thanks.

On Wed, Dec 04, 2013 at 06:10:13PM +0800, 刘先洋 rend...@gmail.com wrote:
 A user does not insert an fieldmark of object.There will be no the object
 when you save a document.
 How to generate a document that contains the object.
 Can you teach me how to use?
 Or you give me an example of a document.

If you want to generate a ODT document that contains a fieldmark, the
easiest way is to create a selection, attach a comment to that, and save
the document.

 I can not find field:fieldmark (start, end,or field) of node in Open Format
 Document v1.2, Part 1 OpenDocument Schema
 I use google find someone to discussed field: fieldmark.

That's an odf extension, pending here:

https://tools.oasis-open.org/issues/browse/OFFICE-2096

See more details about it in our wiki:

https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#LibreOffice_ODF_extensions

 Is there another word processing software will generate a document which
 using the object(fieldmark)?

I think ATM only LibreOffice generates the fieldmark ODF elements.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: I have some questions for libreoffice development.

[Miklos Vajna]

Hi,

On Wed, Dec 04, 2013 at 03:55:55PM +0100, - mrmister...@gmail.com wrote:
 We have created a group in Facebook to develop extensions for
 LibreOffice, perhaps you would like to join us?
 https://www.facebook.com/groups/programadoreslibreoffice/members/
 The group was created by people speaking spanish, but don't worry,
 we speak also English there.
 Please, join us, and bring as much people you can, as much we be,
 more can we learn and share.

If you have specific questions, please always use our mailing lists and
we'll try to help.

See http://www.libreoffice.org/get-help/mailing-lists/ for details.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Please revert this commit...

[Samuel Mehrbrodt]

Hi,

can you please revert 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a50a2111a31e4d9dd5e2659a146e9de8e292de75 
?


That one is still needed as the functionality I removed from below the 
scrollbar is still available in the Navigator. Now you cannot change the 
element by which you navigate anymore.


Thanks
Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Navigation buttons in Writer Search bar

[Samuel Mehrbrodt]

Sorry, I forgot to attach the patch.
Here's what I've done so far.
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 1afe40e..72c9752 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2319,6 +2319,21 @@
   value xml:lang=en-USContinue previous numbering/value
 /prop
   /node
+  node oor:name=.uno:NavigationPopup oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USNavigate by/value
+/prop
+  /node
+  node oor:name=.uno:ScrollToPrevious oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USPrevious Page/value
+/prop
+  /node
+  node oor:name=.uno:ScrollToNext oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USNext Page/value
+/prop
+  /node
   node oor:name=.uno:NavigateBack oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USBack/value
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 2c7afac..4ed35a4 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -204,8 +204,7 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_DROP_REGION_LINK (FN_VIEW + 38)  /**/
 #define FN_DROP_REGION_COPY (FN_VIEW + 39)  /**/
 
-#define FN_SCROLL_NAVIGATION(FN_VIEW + 40)  /* Navigation Controller in the scrollbar */
-#define FN_SCROLL_NEXT_PREV (FN_VIEW + 41)  /* processes MoveType */
+#define FN_SCROLL_NAVIGATION(FN_VIEW + 40)  /* Navigation Controller */
 
 #define FN_VIEW_HIDDEN_PARA (FN_VIEW + 42)  /* View hidden paragraphs */
 #define FN_VIEW_SMOOTH_SCROLL   (FN_VIEW + 43)
@@ -223,6 +222,10 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_VSCROLL_METRIC(FN_VIEW + 54) /* Metric vertical scrollbar */
 #define FN_VIEW_NOTES(FN_VIEW + 55)
 
+#define FN_NAVIGATION_POPUP (FN_VIEW + 56)  /* Navigation Popup */
+#define FN_SCROLL_PREV  (FN_VIEW + 57)  /* uno:ScrollToPrevious */
+#define FN_SCROLL_NEXT  (FN_VIEW + 58)  /* uno:ScrollToNext */
+
 /*
 Region: Insert
  */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 54152af..7513606 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -76,7 +76,15 @@ interface BaseTextEditView
 ExecMethod = NoExec ;
 StateMethod = NoState ;
 ]
-FN_SCROLL_NEXT_PREV
+FN_NAVIGATION_POPUP
+[
+ExecMethod = Execute;
+]
+FN_SCROLL_PREV
+[
+ExecMethod = Execute;
+]
+FN_SCROLL_NEXT
 [
 ExecMethod = Execute;
 ]
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 9cb8c62..0f66712 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -6803,9 +6803,56 @@ SfxBoolItem ScrollNavigation FN_SCROLL_NAVIGATION
 GroupId = GID_VIEW;
 ]
 
-//--
-SfxVoidItem ScrollNextPrev FN_SCROLL_NEXT_PREV
-( SfxBoolItem ScrollNextPrev FN_SCROLL_NEXT_PREV )
+SfxVoidItem NavigationPopup FN_NAVIGATION_POPUP
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_NAVIGATOR;
+]
+
+SfxVoidItem ScrollToPrevious FN_SCROLL_PREV
+()
+[
+/* flags: */
+AutoUpdate = FALSE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+Synchron;
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = FALSE,
+GroupId = GID_NAVIGATOR;
+]
+
+SfxVoidItem ScrollToNext FN_SCROLL_NEXT
+()
 [
 /* flags: */
 AutoUpdate = FALSE,
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index a9c96c7..73f1bcd 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -559,15 +559,12 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 }
 else
 {
-SfxBoolItem aNext(FN_SCROLL_NEXT_PREV, NID_NEXT == nSet);
-Any a;
-Sequence PropertyValue  aArgs( 1 );
-aArgs[0].Name = ScrollNextPrev;
-aNext.QueryValue( a );
-aArgs[0].Value = a;
+

Re: LibO 4.2.0.0beta2 can't launch internal help

[Sophie]

Hi Raymond,
Le 05/12/2013 04:45, r_ouellette a écrit :
 I had the same behavior with 4.2.0.0 beta1. Right now I'm using:
 Version: 4.2.0.0.beta2
 Build ID: 1a27be92e320f97c20d581a69ef1c8b99ea9885d

You're mail would have more answers on a users list or the qa list.
 
 64 bits, Ubuntu-Linux 13.10. I installed also the two french tar.gz packages
 for localisation and for help. A few strings don't appear in french (mostly
 in the Options Menu for settings). But my main concern is the fact that I
 can't launch the internal help, only the web version opens. The french help
 is correctly installed and visible in /opt/libreoffice4.2/help/fr. I double
 checked with a LibO 4.1 working installation and the 4.2 installation seems
 similar...

The French localization is not over, so not integrated yet. If you want
to test the 4.2.0 beta versions, I recommend you don't install the
languages pack as they can show errors.
 
 The internal help is very useful, very complete and, most of all, can be
 accessed without an Internet connection.
 
 I tried to find in different settings files to correct this behavior :-( but
 no success...
 
 Someone has a hint?

This is a bug that was discussed on the qa list.

Kind regards
Sophie

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibO 4.2.0.0beta2 can't launch internal help

[Jean-Baptiste Faure]

Hi,

Le 05/12/2013 04:45, r_ouellette a écrit :
 I had the same behavior with 4.2.0.0 beta1. Right now I'm using:
 Version: 4.2.0.0.beta2
 Build ID: 1a27be92e320f97c20d581a69ef1c8b99ea9885d
 
 64 bits, Ubuntu-Linux 13.10. I installed also the two french tar.gz packages
 for localisation and for help. A few strings don't appear in french (mostly
 in the Options Menu for settings). But my main concern is the fact that I
 can't launch the internal help, only the web version opens. The french help
 is correctly installed and visible in /opt/libreoffice4.2/help/fr. I double
 checked with a LibO 4.1 working installation and the 4.2 installation seems
 similar...

Known bug : https://bugs.freedesktop.org/show_bug.cgi?id=72022
Already added to the MAB list.

Best regards.
JBF


-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source

[Eike Rathke]

 sc/inc/scmod.hxx |1 +
 sc/source/ui/app/inputhdl.cxx|   14 ++
 sc/source/ui/app/scmod.cxx   |7 +++
 sc/source/ui/formdlg/formula.cxx |2 +-
 sc/source/ui/inc/inputhdl.hxx|1 +
 5 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 22ff85716967e573ec3bfdb8c9b17cab7b30d8a4
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 01:50:38 2013 +0100

resolved fdo#71667 and fdo#72278, fdo#69971 follow-up fix

a9d85d62a889288b17899c8defc020da487d8b36 used
ScInputHandler::EnterHandler() to reset all sort of things related to
input EditEngine, but that is a handler for Enter and does not enter a
handler and actually attempts to finalize input, which lead to various
unwanted side effects.

Introduced ScInputHandler::InputTurnOffWinEngine() as only the input bar
window EditEngine needs to be reset in the window switching case (which
EnterHandler also does hence it did prevent that bug). The approach
could be polished with further refinement but most importantly fixes the
actual problems now.

(cherry picked from commit dfd1a47a38dac743f9ed0f1e9507714bac027d35)

Conflicts:
sc/inc/scmod.hxx
sc/source/ui/app/scmod.cxx

Change-Id: I9a0bc452b49ba11a3313cafbc1e5972f41dc65c7
Reviewed-on: https://gerrit.libreoffice.org/6935
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 5f2e61a..014edb1 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -222,6 +222,7 @@ SC_DLLPUBLICvoidSetAppOptions   ( 
const ScAppOptions rO
 voidInputGetSelection( xub_StrLen rStart, xub_StrLen 
rEnd );
 voidInputSetSelection( xub_StrLen nStart, xub_StrLen nEnd 
);
 voidInputReplaceSelection( const String rStr );
+voidInputTurnOffWinEngine();
 String  InputGetFormulaStr();
 voidActivateInputWindow( const String* pStr = NULL,
 sal_Bool bMatrix = false );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 76e0752..b31489c 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3894,6 +3894,20 @@ void ScInputHandler::InputReplaceSelection( const 
OUString rStr )
 bModified = true;
 }
 
+void ScInputHandler::InputTurnOffWinEngine()
+{
+bInOwnChange = true;// disable ModifyHdl (reset below)
+
+eMode = SC_INPUT_NONE;
+/* TODO: it would be better if there was some way to reset the input bar
+ * engine instead of deleting and having it recreate through
+ * GetFuncEditView(), but first least invasively let this fix fdo#71667 and
+ * fdo#72278 without reintroducing fdo#69971. */
+StopInputWinEngine(true);
+
+bInOwnChange = false;
+}
+
 //
 //  ScInputHdlState
 //
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 5a57479..182eb6e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1543,6 +1543,13 @@ void ScModule::InputReplaceSelection( const String rStr 
)
 pHdl-InputReplaceSelection( rStr );
 }
 
+void ScModule::InputTurnOffWinEngine()
+{
+ScInputHandler* pHdl = GetInputHdl();
+if (pHdl)
+pHdl-InputTurnOffWinEngine();
+}
+
 String ScModule::InputGetFormulaStr()
 {
 ScInputHandler* pHdl = GetInputHdl();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 80268da..2deaf0d 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -621,7 +621,7 @@ void ScFormulaDlg::setCurrentFormula(const String 
_sReplacement)
 //ScMultiTextWnd::Paint a new editengine will have been created via
 //GetEditView with its default Modification handler enabled. So ensure
 //its off when we will access it via InputReplaceSelection
-pScMod-InputEnterHandler();
+pScMod-InputTurnOffWinEngine();
 }
 pScMod-InputReplaceSelection(_sReplacement);
 }
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 0f0ac6e..8d0d44f 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -233,6 +233,7 @@ public:
 voidInputGetSelection   ( xub_StrLen rStart, xub_StrLen 
rEnd );
 voidInputSetSelection   ( xub_StrLen nStart, xub_StrLen 
nEnd );
 voidInputReplaceSelection   ( const OUString rStr );
+voidInputTurnOffWinEngine();
 
 boolIsFormulaMode() const   { return 
bFormulaMode; }
 ScInputWindow*  GetInputWindow(){ return 

[Libreoffice-commits] core.git: offapi/com

[Jacobo Aragunde Pérez]

 offapi/com/sun/star/style/CharacterProperties.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5be2c6d98b65ae7615dbef1b41db861b56a32399
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Thu Dec 5 10:24:55 2013 +0100

Fix @since annotation

Change-Id: Id8aff4a640c61472aa4ca3a060112f377b5809d9

diff --git a/offapi/com/sun/star/style/CharacterProperties.idl 
b/offapi/com/sun/star/style/CharacterProperties.idl
index aadd7a4..5d56f0f 100644
--- a/offapi/com/sun/star/style/CharacterProperties.idl
+++ b/offapi/com/sun/star/style/CharacterProperties.idl
@@ -444,7 +444,7 @@ published service CharacterProperties
 
 /** Grab bag of character properties, used as a string-any map for interim 
interop purposes.
 
-@since LibreOffice 4.2
+@since LibreOffice 4.3
 
 pThis property is intentionally not handled by the ODF filter. Any
 member that should be handled there should be first moved out from 
this grab
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - pyuno/zipcore

[Stephan Bergmann]

 pyuno/zipcore/python.cxx |   32 +---
 1 file changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 89ce364a536a6cb8329e9e0758a5509d5fc19d99
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 29 17:26:54 2013 +0100

wsprintf is broken by design and never writes more than 1024 characters

Change-Id: I791e55bb5d98ee82c01271dcebafa7c4672cd424
(cherry picked from commit 50bd5c11f551f5274be9a4411c5ddcbd32bd9a03)
Reviewed-on: https://gerrit.libreoffice.org/6930
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 34ff2e2..2d090fc 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -192,10 +192,12 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 exit(EXIT_FAILURE);
 }
 }
-wchar_t * value = new wchar_t[
-(urepathEnd - urepath) + MY_LENGTH(L;) + (pathEnd - path) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(value, L%s;%s%s%s, urepath, path, n == 0 ? L : L;, orig);
+std::size_t len = (urepathEnd - urepath) + MY_LENGTH(L;) +
+(pathEnd - path) + (n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1;
+//TODO: overflow
+wchar_t * value = new wchar_t[len];
+_snwprintf(
+value, len, L%s;%s%s%s, urepath, path, n == 0 ? L : L;, orig);
 if (!SetEnvironmentVariableW(LPATH, value)) {
 exit(EXIT_FAILURE);
 }
@@ -218,21 +220,21 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
 }
 }
 #ifdef __MINGW32__
-value = new wchar_t[
-(pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
+len = (pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
 MY_LENGTH(L;) + (pythonpath4End - pythonpath4) +
 MY_LENGTH(L;) + (pythonpath3End - pythonpath3) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(
-value, L%s;%s;%s;%s%s%s, path, pythonpath2, pythonpath4, pythonpath3,
-n == 0 ? L : L;, orig);
+(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1; //TODO: overflow
+value = new wchar_t[len];
+_snwprintf(
+value, len, L%s;%s;%s;%s%s%s, path, pythonpath2, pythonpath4,
+pythonpath3, n == 0 ? L : L;, orig);
 #else
-value = new wchar_t[
-(pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
+len = (pathEnd - path) + MY_LENGTH(L;) + (pythonpath2End - pythonpath2) +
 MY_LENGTH(L;) + (pythonpath3End - pythonpath3) +
-(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1]; //TODO: overflow
-wsprintfW(
-value, L%s;%s;%s%s%s, path, pythonpath2, pythonpath3,
+(n == 0 ? 0 : MY_LENGTH(L;) + (n - 1)) + 1; //TODO: overflow
+value = new wchar_t[len];
+_snwprintf(
+value, len, L%s;%s;%s%s%s, path, pythonpath2, pythonpath3,
 n == 0 ? L : L;, orig);
 #endif
 if (!SetEnvironmentVariableW(LPYTHONPATH, value)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppcanvas/source

[Matúš Kukan]

 cppcanvas/source/mtfrenderer/emfplus.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6bd555fd034582352dca98266f600340ade1895e
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Wed Dec 4 16:57:34 2013 +0100

EMF+: Do not ignore source rectangle of the image to be rendered.

Change-Id: I4f861c7653c89d8f1ca73696e885f33f7bfc3b06
Reviewed-on: https://gerrit.libreoffice.org/6932
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index bf9720b..2387934 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1862,6 +1862,7 @@ namespace cppcanvas
 sal_Int32 aCount;
 
 ReadRectangle (rMF, sx, sy, sw, sh);
+Rectangle aSource(Point(sx, sy), Size(sw, sh));
 
 SAL_INFO(cppcanvas.emf, EMF+   (type == 
EmfPlusRecordTypeDrawImagePoints ? DrawImagePoints : DrawImage)   source 
rectangle:   sx  ,  sy sw  x  sh);
 
@@ -1902,6 +1903,7 @@ namespace cppcanvas
 
 if (bValid) {
 BitmapEx aBmp( image.graphic.GetBitmapEx 
() );
+aBmp.Crop( aSource );
 
 Size aSize( aBmp.GetSizePixel() );
 SAL_INFO(cppcanvas.emf, EMF+ bitmap 
size:   aSize.Width()  x  aSize.Height());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

ralf.kr...@bluewin.ch changed:

   What|Removed |Added

 Depends on||72072

--- Comment #30 from ralf.kr...@bluewin.ch ---
Add bug #72072: Text disappear when editing a 90deg Textbox.
This feature worked without problems in LO 4.0.x. So it may prevent users to
update to the most actual version.

-- 
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: What is the baseline for sdremote?

[Christian Lohmaier]

Hi Artur, *,

On Wed, Dec 4, 2013 at 1:42 PM, Artur Dryomov artur.dryo...@gmail.com wrote:

 The lowest supported API version is 10, it is declared at the 
 AndroidManifest.xml as minSdkVersion.

Thanks - I was confused by the target version that is set to 14 in the
.project file...

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

ralf.kr...@bluewin.ch changed:

   What|Removed |Added

 Depends on||72075

--- Comment #120 from ralf.kr...@bluewin.ch ---
Add bug #72072: Text disappear when editing a 90deg Textbox.
This feature worked without problems in LO 4.0.x. So it may prevent users to
update to the most actual version.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/sifr

[Norah A . Abanumay]

 icon-themes/sifr/cmd/lc_arrowshapes.chevron.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow-callout.png
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.notched-right-arrow.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.pentagon-right.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.s-sharped-arrow.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.split-arrow.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.split-round-arrow.png   
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.striped-right-arrow.png 
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-arrow.png
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow-callout.png   
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png   
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow-callout.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow.png  
|binary
 icon-themes/sifr/cmd/lc_arrowshapes.up-right-down-arrow.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.block-arc.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.can.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.circle-pie.png  
|binary
 icon-themes/sifr/cmd/lc_basicshapes.circle.png  
|binary
 icon-themes/sifr/cmd/lc_basicshapes.cross.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.cube.png
|binary
 icon-themes/sifr/cmd/lc_basicshapes.diamond.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.ellipse.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.frame.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.hexagon.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.isosceles-triangle.png  
|binary
 icon-themes/sifr/cmd/lc_basicshapes.octagon.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.paper.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.parallelogram.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.pentagon.png
|binary
 icon-themes/sifr/cmd/lc_basicshapes.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.quadrat.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.rectangle.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.right-triangle.png  
|binary
 icon-themes/sifr/cmd/lc_basicshapes.ring.png
|binary
 icon-themes/sifr/cmd/lc_basicshapes.round-quadrat.png   
|binary
 icon-themes/sifr/cmd/lc_basicshapes.round-rectangle.png 
|binary
 icon-themes/sifr/cmd/lc_basicshapes.trapezoid.png   
|binary
 icon-themes/sifr/cmd/lc_bezier_unfilled.png 
|binary
 icon-themes/sifr/cmd/lc_bezierfill.png  
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.cloud-callout.png 
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.png   
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png   
|binary
 icon-themes/sifr/cmd/lc_calloutshapes.round-callout.png 
|binary
 

[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69a7a83c454476341a6d35bcaaf85b15a8c2268a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 10:45:44 2013 +0100

DomainMapper_Impl ctor: we should not be in a footnote property by default

Change-Id: I3441cc08342e9853d27c11769ee010b031085b53

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3181c9f..5973c52 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -160,7 +160,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bInHeaderFooterImport( false ),
 m_bDiscardHeaderFooter( false ),
 m_bLineNumberingSet( false ),
-m_bIsInFootnoteProperties( true ),
+m_bIsInFootnoteProperties( false ),
 m_bIsCustomFtnMark( false ),
 m_bIsParaChange( false ),
 m_bParaChanged( false ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70652] Merge bibisect repositories to one big one ...

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=70652

--- Comment #7 from Qubit qu...@runcibility.com ---
2013-11-25 bibisect repo added to bibisectzilla (and pushed up to test server).

TODOs:
- Have people test the repo
- Get a permanent home for this repo from Cloph

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Stephan Bergmann]

 sw/source/ui/inc/view.hxx|1 +
 sw/source/ui/ribbar/workctrl.cxx |1 +
 sw/source/ui/uiview/viewmdi.cxx  |5 +
 sw/source/ui/uiview/viewsrch.cxx |2 ++
 4 files changed, 9 insertions(+)

New commits:
commit c6abb084ef6b1f86734395058bcafc61458727b4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 5 10:09:50 2013 +0100

Partly revert Appears SwView::SetMoveType no longer really does anything

This reverts most of commit a50a2111a31e4d9dd5e2659a146e9de8e292de75, where 
the
-Werror,-Wunused-variable for SwView::SetMoveType's aColor (after
3e8fe4d8e19be2ccd8f5bb898530e2f615a90321 Remove the Navigator buttons 
below the
scrollbar in Writer had removed its use) had erroneously make me think that
SwView::SetMoveType now effectively didn't do anything anymore, failing to 
note
the

  m_nMoveType = nSet;

part that was still relevant.

Change-Id: I5e43886806533e80e238fef8d836e09e28209b6d

diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 5974689..af14592 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -486,6 +486,7 @@ public:
 static Dialog* GetSearchDialog();
 
 static sal_uInt16   GetMoveType();
+static void SetMoveType(sal_uInt16 nSet);
 DECL_STATIC_LINK( SwView, MoveNavigationHdl, bool* ); // #i75416#
 static void SetActMark(sal_Int32 nSet);
 
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 95d2cad..fe7f141 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -553,6 +553,7 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 sal_uInt16 nSet = pSet-GetCurItemId();
 if( nSet != NID_PREV  nSet != NID_NEXT )
 {
+SwView::SetMoveType(nSet);
 aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]);
 aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + 
NID_COUNT]);
 aInfoField.SetText(aToolBox.GetItemText(nSet));
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 5934bc3..2a73898 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -560,6 +560,11 @@ sal_uInt16 SwView::GetMoveType()
 return m_nMoveType;
 }
 
+void SwView::SetMoveType(sal_uInt16 nSet)
+{
+m_nMoveType = nSet;
+}
+
 void SwView::SetActMark(sal_Int32 nSet)
 {
 m_nActMark = nSet;
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index dd5f127..4436f73 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -165,6 +165,8 @@ void SwView::ExecSearch(SfxRequest rReq, sal_Bool 
bNoMessage)
 case FID_SEARCH_NOW:
 {
 {
+if(FID_SEARCH_NOW == nSlot  !rReq.IsAPI())
+SwView::SetMoveType(NID_SRCH_REP);
 if ( pWrp )
 {
 m_pSrchDlg = static_cast SvxSearchDialog* 
(pWrp-getDialog ());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Please revert this commit...

[Stephan Bergmann]

On 12/05/2013 09:35 AM, Samuel Mehrbrodt wrote:

can you please revert
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a50a2111a31e4d9dd5e2659a146e9de8e292de75
?

That one is still needed as the functionality I removed from below the
scrollbar is still available in the Navigator. Now you cannot change the
element by which you navigate anymore.


Oops, I was too aggressive with removing


-void SwView::SetMoveType(sal_uInt16 nSet)
-{
-sal_Bool bLastPage = m_nMoveType == NID_PGE;
-m_nMoveType = nSet;
-sal_Bool bNewPage = m_nMoveType == NID_PGE;
-if(bNewPage != bLastPage)
-{
-Color aColor(bNewPage ? COL_BLACK : VIEW_IMAGECOLOR);
-const TypeId aTypeId = TYPE(SwView);
-SwView* pView = (SwView*)SfxViewShell::GetFirst(aTypeId);
-while( pView )
-{
-pView = (SwView*)SfxViewShell::GetNext(*pView, aTypeId);
-}
-}
-}


completely, erroneously assuming it effectively didn't do anything 
anymore (I'd been called to action by aColor generating a 
-Werror,-Wunused-variable now), failing to note the


  m_nMoveType = nSet;

part that is still needed.

I resurrected the hopefully correctly simplified version as 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c6abb084ef6b1f86734395058bcafc61458727b4 
Partly revert 'Appears SwView::SetMoveType no longer really does 
anything' now, but cannot test, as I have no idea what Now you cannot 
change the element by which you navigate anymore means.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Please revert this commit...

[Samuel Mehrbrodt]

Thanks.

I have no idea what Now you cannot change the element by which you 
navigate anymore means.


It's in the Navigator (F5) when you click the Navigation button 
(second button in the first row). In the opened window you can jump to 
the next/previous page with the buttons on the right.
If you click one of the other buttons, you change the element you 
navigate by (e.g. Heading: Jump to next/previous heading).

Changing that hat no effect after you removed SetMoveType.

Samuel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/sifr

[Norah A . Abanumay]

 icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow-callout.png |binary
 1 file changed

New commits:
commit 8735d039b00ba4f4ade0d0373b8c6341a9a4d763
Author: Norah A. Abanumay naban...@kacst.edu.sa
Date:   Thu Dec 5 13:05:12 2013 +0300

one missing icon from draw tool-bar

Change-Id: Icfbb671bbe322d08ad8f3f911e99c3ec6761b1f6

diff --git a/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow-callout.png 
b/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow-callout.png
new file mode 100644
index 000..3f3e940
Binary files /dev/null and 
b/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow-callout.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/util solenv/bin solenv/inc

[Andre Fischer]

 instsetoo_native/util/makefile.mk |   18 -
 solenv/bin/deliver.pl |5 
 solenv/bin/macosx-change-install-names.pl |8 
 solenv/bin/macosx-dylib-link-list.pl  |2 
 solenv/bin/modules/installer/patch/InstallationSet.pm |   53 ++-
 solenv/bin/modules/installer/patch/ReleasesList.pm|  237 ---
 solenv/bin/modules/macosxotoolhelper.pm   |4 
 solenv/bin/patch_tool.pl  |  284 +-
 solenv/inc/_tg_app.mk |   43 +-
 solenv/inc/tg_app.mk  |6 
 10 files changed, 565 insertions(+), 95 deletions(-)

New commits:
commit c3ff86d01d4a862f036914243663f40e6dcf9172
Author: Andre Fischer a...@apache.org
Date:   Thu Dec 5 09:10:55 2013 +

123531: patch_tool.pl can now extend releases.xml.

diff --git a/instsetoo_native/util/makefile.mk 
b/instsetoo_native/util/makefile.mk
index 5e6cc6e..67272a7 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -75,6 +75,7 @@ help .PHONY :
 @echo experimental targets:
 @echo patch_create   create a patch for updating an installed 
office (Windows only)
 @echo patch_applyapply a previously created patch
+@echo patch_update_releases_xml
 @echo 
 @echo Most targets (all except aoo_srcrelease and updatepack) accept 
suffixes
 @echo add _language to build a target for one language only
@@ -307,14 +308,25 @@ $(BIN)$/dev$/intro.zip : 
$(SOLARCOMMONPCKDIR)$/openoffice_dev$/intro.zip
 
 .IF $(OS) == WNT
 patch_create .PHONY : $(PRJ)$/data
-perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_create.pl \
+perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl   \
+create \
 --product-name Apache_OpenOffice   \
 --output-path $(OUT)   \
 --data-path $(PRJ)$/data   \
 --lst-file $(PRJ)$/util$/openoffice.lst
 patch_apply .PHONY :
-perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_apply.pl \
-
../wntmsci12.pro/Apache_OpenOffice/msp/v-4-0-1_v-4-1-0/en-US/openoffice.msp
+perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl   \
+apply  \
+--product-name Apache_OpenOffice   \
+--output-path $(OUT)   \
+--lst-file $(PRJ)$/util$/openoffice.lst
+patch_update_releases_xml .PHONY:
+perl -I $(SOLARENV)$/bin/modules $(SOLARENV)$/bin$/patch_tool.pl   \
+update-releases-xml\
+--product-name Apache_OpenOffice   \
+--output-path $(OUT)   \
+--lst-file $(PRJ)$/util$/openoffice.lst\
+--target-version 4.0.1
 
 $(PRJ)$/data :
 mkdir $@
diff --git a/solenv/bin/modules/installer/patch/InstallationSet.pm 
b/solenv/bin/modules/installer/patch/InstallationSet.pm
index 7d6647d..e30adc4 100644
--- a/solenv/bin/modules/installer/patch/InstallationSet.pm
+++ b/solenv/bin/modules/installer/patch/InstallationSet.pm
@@ -304,21 +304,27 @@ sub Download ($$$)
 $installer::logger::Info-printf(downloading %s\n, $basename);
 $installer::logger::Info-printf(from '%s'\n, $location);
 my $filesize = $release_data-{'file-size'};
-$installer::logger::Info-printf(expected size is %d\n, $filesize);
-my $temporary_filename = $filename . .part;
-my $resume_size = 0;
-if ( -f $temporary_filename)
+if (defined $filesize)
+{
+$installer::logger::Info-printf(expected size is %d\n, 
$filesize);
+}
+else
 {
-$resume_size = -s $temporary_filename;
-$installer::logger::Info-printf( trying to resume at %d/%d bytes\n, 
$resume_size, $filesize);
+$installer::logger::Info-printf(file size is not yet known\n);
 }
+my $temporary_filename = $filename . .part;
+my $resume_size = 0;
 
 # Prepare checksum.
 my $checksum = undef;
 my $checksum_type = $release_data-{'checksum-type'};
 my $checksum_value = $release_data-{'checksum-value'};
 my $digest = undef;
-if ($checksum_type eq sha256)
+if ( ! defined $checksum_value)
+{
+# No checksum available.  Skip test.
+}
+elsif ($checksum_type eq sha256)
 {
 $digest = Digest-new(SHA-256);
 }
@@ -335,7 +341,7 @@ sub Download ($$$)
 }
 
 # Download the extension.
-open my $out, $temporary_filename;
+open my $out, $temporary_filename;
 binmode($out);
 
 my $mode = $|;
@@ -359,21 +365,28 @@ sub Download ($$$)
 {
 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d4/4e9a9244558f63b3feaf923802ed32b4931283

[Caolán McNamara]

 d4/4e9a9244558f63b3feaf923802ed32b4931283 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1255a53de33c495d4a84b373a89aacdd8af567c6
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 10:10:27 2013 +

Notes added by 'git notes add'

diff --git a/d4/4e9a9244558f63b3feaf923802ed32b4931283 
b/d4/4e9a9244558f63b3feaf923802ed32b4931283
new file mode 100644
index 000..ba35283
--- /dev/null
+++ b/d4/4e9a9244558f63b3feaf923802ed32b4931283
@@ -0,0 +1 @@
+merged as: 78ed89cebb2a8eaa9e9c480a92426c0070f4d3b6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Jürgen Schmidt]

 sd/source/filter/ppt/pptin.cxx |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 78ed89cebb2a8eaa9e9c480a92426c0070f4d3b6
Author: Jürgen Schmidt j...@apache.org
Date:   Thu Dec 5 08:02:59 2013 +

Resolves: #i123789# ppt import, if sub address is not document...

internal link, take it as it is

(cherry picked from commit d44e9a9244558f63b3feaf923802ed32b4931283)

Conflicts:
sd/source/filter/ppt/pptin.cxx

Change-Id: Ic2541bcf7e368a4e9f2cc87353be165fc203dbac

diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index da9428c..f8585cc 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -421,7 +421,7 @@ sal_Bool ImplSdPPTImport::Import()
 for( nToken = 0; nToken  
nTokenCount; nToken++ )
 aStringAry[nToken] = 
OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), 
RTL_TEXTENCODING_UTF8);
 
-sal_Bool bSucceeded = sal_False;
+sal_Bool bDocInternalSubAddress = 
sal_False;
 
 // first pass, searching for a 
SlideId
 for( nToken = 0; nToken  
nTokenCount; nToken++ )
@@ -438,29 +438,29 @@ sal_Bool ImplSdPPTImport::Import()
 if ( nPage != 
PPTSLIDEPERSIST_ENTRY_NOTFOUND )
 {
 nPageNumber = 
nPage;
-bSucceeded = 
sal_True;
+
bDocInternalSubAddress = sal_True;
 break;
 }
 }
 }
 }
 }
-if ( !bSucceeded )
+if ( !bDocInternalSubAddress )
 {   // second pass, searching for 
a SlideName
 for ( nToken = 0; nToken  
nTokenCount; nToken++ )
 {
-OUString aToken( 
aString.getToken( nToken, (sal_Unicode)',' ) );
+OUString 
aToken(OStringToOUString(aStringAry[nToken], RTL_TEXTENCODING_UTF8));
 
std::vectorOUString::const_iterator pIter =
 
std::find(maSlideNameList.begin(),maSlideNameList.end(),aToken);
 
 if (pIter != 
maSlideNameList.end())
 {
 nPageNumber = pIter - 
maSlideNameList.begin();
-bSucceeded = sal_True;
+bDocInternalSubAddress 
= sal_True;
 }
 }
 }
-if ( !bSucceeded )
+if ( !bDocInternalSubAddress )
 {   // third pass, searching for a 
slide number
 for ( nToken = 0; nToken  
nTokenCount; nToken++ )
 {
@@ -470,13 +470,14 @@ sal_Bool ImplSdPPTImport::Import()
 if ( ( nNumber  ~0xff 
) == 0 )
 {
 nPageNumber = 
(sal_uInt32)nNumber - 1;
-bSucceeded = 
sal_True;
+
bDocInternalSubAddress = sal_True;
 break;
 }
 }
 }
 }
-if ( bSucceeded )
+// if a document internal sub 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c3/ff86d01d4a862f036914243663f40e6dcf9172

[Caolán McNamara]

 c3/ff86d01d4a862f036914243663f40e6dcf9172 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a7522151d95da07fc1315a466c6a89f18df628de
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 10:25:23 2013 +

Notes added by 'git notes add'

diff --git a/c3/ff86d01d4a862f036914243663f40e6dcf9172 
b/c3/ff86d01d4a862f036914243663f40e6dcf9172
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/c3/ff86d01d4a862f036914243663f40e6dcf9172
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5b/1ff7a2b76d3eb7cf0760a7f424df34ebb99420

[Caolán McNamara]

 5b/1ff7a2b76d3eb7cf0760a7f424df34ebb99420 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit df3dd98486f6bf9f9377e8a83399ec3c84cb781f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 10:26:12 2013 +

Notes added by 'git notes add'

diff --git a/5b/1ff7a2b76d3eb7cf0760a7f424df34ebb99420 
b/5b/1ff7a2b76d3eb7cf0760a7f424df34ebb99420
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/5b/1ff7a2b76d3eb7cf0760a7f424df34ebb99420
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl toolkit/source vcl/aqua vcl/inc vcl/source

[Herbert Dürr]

 include/vcl/sysdata.hxx  |2 
 toolkit/source/awt/vclxsystemdependentwindow.cxx |2 
 toolkit/source/awt/vclxtopwindow.cxx |2 
 vcl/aqua/source/app/vclnsapp.mm  |   25 +-
 vcl/aqua/source/gdi/aquaprintaccessoryview.mm|   38 ---
 vcl/aqua/source/gdi/salgdicommon.cxx |6 
 vcl/aqua/source/gdi/salgdiutils.cxx  |2 
 vcl/aqua/source/gdi/salnativewidgets.cxx |4 
 vcl/aqua/source/gdi/salvd.cxx|6 
 vcl/aqua/source/window/salframe.cxx  |  254 +++
 vcl/aqua/source/window/salframeview.mm   |   12 -
 vcl/aqua/source/window/salmenu.cxx   |   24 +-
 vcl/aqua/source/window/salobj.cxx|   20 -
 vcl/inc/aqua/salframe.h  |8 
 vcl/source/window/syschild.cxx   |2 
 vcl/source/window/window.cxx |4 
 16 files changed, 198 insertions(+), 213 deletions(-)

New commits:
commit 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5
Author: Herbert Dürr h...@apache.org
Date:   Mon Dec 2 16:06:37 2013 +

Resolves: #i123795# variable names should not confuse vcl...

Window and cocoa NSWindow types

VCL's Window type and Cocoa's NSWindow type are quite different.
Naming variables as if they were the same introduces gratuitous
complexity especially when debugging stacks where both types are used.
The names of NSView type variables have been adjusted too.

(cherry picked from commit 5e6120c21a979c05bc6b9297035e31a47b98b785)

Conflicts:
vcl/aqua/source/app/vclnsapp.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salgdiutils.cxx
vcl/aqua/source/window/salframe.cxx
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/sysdata.hxx
vcl/source/window/syschild.cxx
vcl/source/window/window.cxx

Change-Id: Ic4143dfddfa9502a529c871ac4ce0bea413b6ce9

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 58f3830..100854b 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -61,7 +61,7 @@ struct SystemEnvData
 #if defined( WNT )
 HWNDhWnd;   // the window hwnd
 #elif defined( MACOSX )
-NSView*   pView;  // the cocoa (NSView *) implementing 
this object
+NSView* mpNSView;   // the cocoa (NSView *) implementing 
this object
 #elif defined( ANDROID )
 // Nothing
 #elif defined( IOS )
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx 
b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 3e55d30..1579c02 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -82,7 +82,7 @@ IMPL_XTYPEPROVIDER_END
 #elif (defined MACOSX)
 if( SystemType == 
::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
 {
- aRet = (sal_IntPtr)pSysData-pView;
+ aRet = (sal_IntPtr)pSysData-mpNSView;
 }
 #elif (defined ANDROID)
 // Nothing
diff --git a/toolkit/source/awt/vclxtopwindow.cxx 
b/toolkit/source/awt/vclxtopwindow.cxx
index 28211f9..d382d3f 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -94,7 +94,7 @@ Sequence Type  VCLXTopWindow_Base::getTypes() 
throw(RuntimeException)
 #elif (defined MACOSX)
 if( SystemType == 
::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
 {
- aRet = (sal_IntPtr)pSysData-pView;
+ aRet = (sal_IntPtr)pSysData-mpNSView;
 }
 #elif (defined ANDROID)
 // Nothing
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 738db9e..7c55f8e 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -91,9 +91,9 @@
 // instead.
 
 // Instead of:
-// [pFrame-getWindow() windowShouldClose: nil];
+// [pFrame-getNSWindow() windowShouldClose: nil];
 // do:
-objc_msgSend(pFrame-getWindow(), 
@selector(windowShouldClose:), nil);
+objc_msgSend(pFrame-getNSWindow(), 
@selector(windowShouldClose:), nil);
 
 return;
 }
@@ -104,9 +104,9 @@
  */
 if( [[pEvent charactersIgnoringModifiers] isEqualToString: @m] )
 {
-if ( nModMask == NSCommandKeyMask  ([pFrame-getWindow() 
styleMask]  NSMiniaturizableWindowMask) )
+if ( nModMask == NSCommandKeyMask  ([pFrame-getNSWindow() 
styleMask]  NSMiniaturizableWindowMask) )
 {
-[pFrame-getWindow() performMiniaturize: nil];
+[pFrame-getNSWindow() performMiniaturize: nil];
 return;
 }
 
@@ 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 01/df80b40a193bb9f57c6a2d025ce89e79a2978b 88/10e06850ee218d4b3059aa33b5058dfcab853c f3/b3a6daf24c4fd9ca9d5b726c64d44017bef71a

[Caolán McNamara]

 01/df80b40a193bb9f57c6a2d025ce89e79a2978b |1 +
 88/10e06850ee218d4b3059aa33b5058dfcab853c |1 +
 f3/b3a6daf24c4fd9ca9d5b726c64d44017bef71a |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 77118541e4f12be089def98baf2699b2dba8bcdb
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 10:40:38 2013 +

Notes added by 'git notes add'

diff --git a/f3/b3a6daf24c4fd9ca9d5b726c64d44017bef71a 
b/f3/b3a6daf24c4fd9ca9d5b726c64d44017bef71a
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/f3/b3a6daf24c4fd9ca9d5b726c64d44017bef71a
@@ -0,0 +1 @@
+ignore: aoo
commit fac341ea92a1ae5cd026ecf4db8602a3e9d37214
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 10:40:32 2013 +

Notes added by 'git notes add'

diff --git a/88/10e06850ee218d4b3059aa33b5058dfcab853c 
b/88/10e06850ee218d4b3059aa33b5058dfcab853c
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/88/10e06850ee218d4b3059aa33b5058dfcab853c
@@ -0,0 +1 @@
+ignore: aoo
commit e2c546feeffa9e84f89bb548575e84c0f1f4684a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 10:40:25 2013 +

Notes added by 'git notes add'

diff --git a/01/df80b40a193bb9f57c6a2d025ce89e79a2978b 
b/01/df80b40a193bb9f57c6a2d025ce89e79a2978b
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/01/df80b40a193bb9f57c6a2d025ce89e79a2978b
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4-2-milestone-3'

[Ray]

Tag 'libreoffice-4-2-milestone-3' created by Michael Meeks 
michael.me...@collabora.com at 2013-12-05 10:43 -0800

milestone three

Changes since libreoffice-4-2-milestone-2-71:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - config_host.mk.in configure.ac .gitignore postprocess/Rdb_services.mk ucb/Module_ucb.mk

[Tor Lillqvist]

 .gitignore  |2 ++
 config_host.mk.in   |2 ++
 configure.ac|   13 -
 postprocess/Rdb_services.mk |4 ++--
 ucb/Module_ucb.mk   |4 ++--
 5 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 215f87fb53164a5fc9af13acdad7fdada2117b60
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 12:23:08 2013 +0200

We need an ENABLE_CURL, too

It is not enough to just have CURL in BUILD_TYPE or not. At least the
ftp UCP requires libcurl unconditionally, so it can't be built if we
don't have either a system or bundled libcurl.

Change-Id: I38e9939acb160d581e9a070a6cd7a0c89ddb5266

diff --git a/config_host.mk.in b/config_host.mk.in
index 79958f9..e1f0226f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -108,6 +108,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CMIS=@ENABLE_CMIS@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
+export ENABLE_CURL=@ENABLE_CURL@
 export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
 export ENABLE_DBUS=@ENABLE_DBUS@
 export ENABLE_DEBUG=@ENABLE_DEBUG@
diff --git a/configure.ac b/configure.ac
index 7aad761..c3ffe05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8640,17 +8640,21 @@ if test $with_system_curl = yes; then
 libo_MINGW_TRY_DLL([libgpg-error])
 libo_MINGW_TRY_DLL([libgcrypt])
 libo_MINGW_TRY_DLL([libssh2])
+ENABLE_CURL=TRUE
 elif test $_os = iOS; then
 # Let's see if we need curl, I think not?
 AC_MSG_RESULT([none])
+ENABLE_CURL=
 else
 AC_MSG_RESULT([internal])
 SYSTEM_CURL=NO
 BUILD_TYPE=$BUILD_TYPE CURL
+ENABLE_CURL=TRUE
 fi
 AC_SUBST(SYSTEM_CURL)
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
+AC_SUBST(ENABLE_CURL)
 
 dnl ===
 dnl Check for system boost
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index ad1ac49..c044e14 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -96,7 +96,7 @@ $(eval $(call gb_Rdb_add_components,services,\
ucb/source/ucp/expand/ucpexpand1 \
ucb/source/ucp/ext/ucpext \
ucb/source/ucp/file/ucpfile1 \
-   ucb/source/ucp/ftp/ucpftp1 \
+   $(if $(ENABLE_CURL),ucb/source/ucp/ftp/ucpftp1) \
ucb/source/ucp/hierarchy/ucphier1 \
ucb/source/ucp/package/ucppkg1 \
ucb/source/ucp/tdoc/ucptdoc1 \
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index 805a21b..1e64c24 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,ucb,\
Library_ucpexpand1 \
Library_ucpext \
Library_ucpfile1 \
-   Library_ucpftp1 \
+   $(if $(ENABLE_CURL),Library_ucpftp1) \
Library_ucphier1 \
Library_ucppkg1 \
Library_ucptdoc1 \
commit ef8c2098a8528c0ca3cd9c66e23f4420f8660d19
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 12:00:59 2013 +0200

Ignore also instdir_for_build and workdir_for_build

Change-Id: I2e6a26cd1e54ad28ec27f2205262413db039a136

diff --git a/.gitignore b/.gitignore
index a227af3..64ebb3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,9 @@
 
 # where stuff are built
 /instdir
+/instdir_for_build
 /workdir
+/workdir_for_build
 
 # where the external downloads maybe located
 /external/tarballs
commit 4eaa08f1d4e110dd3c3f464eaf9e7c526b7c28f7
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 12:00:06 2013 +0200

Let's try to manage without building libcmis for iOS

libcmis needs curl and sice 618052e201318bcfba8a0fcdd29cf88eaa4a143e
we don't build that for iOS.

Change-Id: I78b5faa1a997a3e304cdbd80e254eab370caf552

diff --git a/config_host.mk.in b/config_host.mk.in
index ba194a4..79958f9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -105,6 +105,7 @@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@
 export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@
 export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+export ENABLE_CMIS=@ENABLE_CMIS@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
diff --git a/configure.ac b/configure.ac
index 82909e2..7aad761 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7743,7 +7743,14 @@ 
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.0])
 dnl ===
 dnl Check for system libcmis
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 = 0.4.0])
+# libcmis requires curl and we can't build curl for iOS
+if test $_os != iOS; then
+libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 = 0.4.0])
+ENABLE_CMIS=TRUE
+else
+ENABLE_CMIS=
+fi
+AC_SUBST(ENABLE_CMIS)
 
 dnl ===
 dnl Check for system 

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx  |3 +--
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit b38629ae210b204a6d24d6e9c5c62eaaf563d494
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 11:33:56 2013 +0100

cp#117 DOCX/RTF import: avoid fake tab char in footnotes

Word wants this, so it's added by the exporter to the document, but on
import we should ignore it.

Change-Id: Idcb669ba624bf462a50a85eb4aacf397afb6efe6

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 7579229..88df7ad 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1358,9 +1358,8 @@ DECLARE_RTFIMPORT_TEST(testCp118, cp118.rtf)
 uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
 uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
-// Why the tab has to be removed here?
 OUString aExpected(Footnote first line.\n);
-CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString().replaceAll(\t, 
));
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString());
 }
 
 #endif
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 306ef9c..742ef98 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3888,6 +3888,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 m_pImpl-m_bHasFtnSep = true;
 return;
 }
+else if (len == 1  sText[0] == '\t'  m_pImpl-m_bIgnoreNextTab)
+{
+m_pImpl-m_bIgnoreNextTab = false;
+return;
+}
 
 try
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5973c52..048e691 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -177,6 +177,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_nTableDepth(0),
 m_bHasFtnSep(false),
 m_bIgnoreNextPara(false),
+m_bIgnoreNextTab(false),
 m_bFrameBtLr(false)
 
 {
@@ -1531,6 +1532,11 @@ void DomainMapper_Impl::PushFootOrEndnote( bool 
bIsFootnote )
 
 // Redlines for the footnote anchor
 CheckRedline( xFootnote-getAnchor( ) );
+
+// Word has a leading tab on footnotes, but we don't implement space
+// between the footnote number and text using a tab, so just ignore
+// that for now.
+m_bIgnoreNextTab = true;
 }
 catch( const uno::Exception e )
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 130ee1a..1ebf067 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -725,6 +725,8 @@ public:
 
 /// If the next newline should be ignored, used by the special footnote 
separator paragraph.
 bool m_bIgnoreNextPara;
+/// If the next tab should be ignored, used for footnotes.
+bool m_bIgnoreNextTab;
 bool m_bFrameBtLr; /// Bottom to top, left to right text frame direction 
is requested for the current text frame.
 /// Pending floating tables: they may be converted to text frames at the 
section end.
 std::vectorFloatingTableInfo m_aPendingFloatingTables;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Please revert this commit...

[Stephan Bergmann]

On 12/05/2013 10:58 AM, Samuel Mehrbrodt wrote:

I have no idea what Now you cannot change the element by which you
navigate anymore means.


It's in the Navigator (F5) when you click the Navigation button
(second button in the first row). In the opened window you can jump to
the next/previous page with the buttons on the right.
If you click one of the other buttons, you change the element you
navigate by (e.g. Heading: Jump to next/previous heading).
Changing that hat no effect after you removed SetMoveType.


Ah; works again.

Stephan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx  |3 +--
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 ++
 4 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit bf53bea48d5184455841a8d8963eea35293c0b8e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 11:33:56 2013 +0100

cp#117 DOCX/RTF import: avoid fake tab char in footnotes

Word wants this, so it's added by the exporter to the document, but on
import we should ignore it.

Change-Id: Idcb669ba624bf462a50a85eb4aacf397afb6efe6
(cherry picked from commit b38629ae210b204a6d24d6e9c5c62eaaf563d494)

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 78fafea..4ea280c 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1360,9 +1360,8 @@ DECLARE_RTFIMPORT_TEST(testCp118, cp118.rtf)
 uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
 uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
-// Why the tab has to be removed here?
 OUString aExpected(Footnote first line.\n);
-CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString().replaceAll(\t, 
));
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString());
 }
 
 #endif
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index ae81ad5..06ea11c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3859,6 +3859,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 m_pImpl-m_bHasFtnSep = true;
 return;
 }
+else if (len == 1  sText[0] == '\t'  m_pImpl-m_bIgnoreNextTab)
+{
+m_pImpl-m_bIgnoreNextTab = false;
+return;
+}
 
 try
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3181c9f..6b9562b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -177,6 +177,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_nTableDepth(0),
 m_bHasFtnSep(false),
 m_bIgnoreNextPara(false),
+m_bIgnoreNextTab(false),
 m_bFrameBtLr(false)
 
 {
@@ -1531,6 +1532,11 @@ void DomainMapper_Impl::PushFootOrEndnote( bool 
bIsFootnote )
 
 // Redlines for the footnote anchor
 CheckRedline( xFootnote-getAnchor( ) );
+
+// Word has a leading tab on footnotes, but we don't implement space
+// between the footnote number and text using a tab, so just ignore
+// that for now.
+m_bIgnoreNextTab = true;
 }
 catch( const uno::Exception e )
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 130ee1a..1ebf067 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -725,6 +725,8 @@ public:
 
 /// If the next newline should be ignored, used by the special footnote 
separator paragraph.
 bool m_bIgnoreNextPara;
+/// If the next tab should be ignored, used for footnotes.
+bool m_bIgnoreNextTab;
 bool m_bFrameBtLr; /// Bottom to top, left to right text frame direction 
is requested for the current text frame.
 /// Pending floating tables: they may be converted to text frames at the 
section end.
 std::vectorFloatingTableInfo m_aPendingFloatingTables;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 67576, which changed state.

Bug 67576 Summary: impossible to set printing page size manually
https://bugs.freedesktop.org/show_bug.cgi?id=67576

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx  |3 +--
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 +++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 256c04feaadd789063a18f5cbd4f561bf5987d91
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 11:33:56 2013 +0100

cp#117 DOCX/RTF import: avoid fake tab char in footnotes

Word wants this, so it's added by the exporter to the document, but on
import we should ignore it.

(cherry picked from commit b38629ae210b204a6d24d6e9c5c62eaaf563d494)

Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/DomainMapper_Impl.hxx

Change-Id: Idcb669ba624bf462a50a85eb4aacf397afb6efe6

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index df2afe9..c971ed6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1519,9 +1519,8 @@ void Test::testCp118()
 uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
 uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
-// Why the tab has to be removed here?
 OUString aExpected(Footnote first line.\n);
-CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString().replaceAll(\t, 
));
+CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange-getString());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 33c1ad1..dfbc4a7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3681,6 +3681,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 m_pImpl-m_pSdtHelper-createDateControl(sText);
 return;
 }
+else if (len == 1  sText[0] == '\t'  m_pImpl-m_bIgnoreNextTab)
+{
+m_pImpl-m_bIgnoreNextTab = false;
+return;
+}
 
 try
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e8a160b..429381d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -191,7 +191,8 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bIsNewDoc(bIsNewDoc),
 m_bInTableStyleRunProps(false),
 m_pSdtHelper(0),
-m_nTableDepth(0)
+m_nTableDepth(0),
+m_bIgnoreNextTab(false)
 
 {
 appendTableManager( );
@@ -1515,6 +1516,11 @@ void DomainMapper_Impl::PushFootOrEndnote( bool 
bIsFootnote )
 
 // Redlines for the footnote anchor
 CheckRedline( xFootnote-getAnchor( ) );
+
+// Word has a leading tab on footnotes, but we don't implement space
+// between the footnote number and text using a tab, so just ignore
+// that for now.
+m_bIgnoreNextTab = true;
 }
 catch( const uno::Exception e )
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 8bc422f..17d2b5a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -716,6 +716,8 @@ public:
  * PFInTable SPRM or not).
  */
 sal_Int32 m_nTableDepth;
+/// If the next tab should be ignored, used for footnotes.
+bool m_bIgnoreNextTab;
 /// Pending floating tables: they may be converted to text frames at the 
section end.
 std::vectorFloatingTableInfo m_aPendingFloatingTables;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/svx sc/source sd/source starmath/source svtools/source svx/source

[Stephan Bergmann]

 include/editeng/unotext.hxx   |   10 +-
 include/svx/unoshprp.hxx  |   22 +++---
 sc/source/ui/unoobj/docuno.cxx|   12 +---
 sc/source/ui/unoobj/shapeuno.cxx  |2 +-
 sd/source/filter/xml/sdxmlwrp.cxx |   14 ++
 sd/source/ui/unoidl/unomodel.cxx  |   12 ++--
 sd/source/ui/unoidl/unoobj.cxx|   10 +-
 sd/source/ui/unoidl/unopage.cxx   |   16 
 starmath/source/unomodel.cxx  |   10 +-
 svtools/source/uno/unoimap.cxx|   10 +-
 svx/source/unodraw/unoprov.cxx|   14 +++---
 11 files changed, 28 insertions(+), 104 deletions(-)

New commits:
commit 059cc67245a4f0a62589a0c877aea85e8859c435
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 5 11:48:56 2013 +0100

Remove obsolete SEQTYPE workaround

Change-Id: I366b29038be034b03a16fa6d7f6873dc78d8d88f

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 7479399..8c9da3f 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -62,14 +62,6 @@
 
 class SvxItemPropertySet;
 
-#ifndef SEQTYPE
- #if defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500)
-  #define SEQTYPE(x) (new ::com::sun::star::uno::Type( x ))
- #else
-  #define SEQTYPE(x) (x)
- #endif
-#endif
-
 #define WID_FONTDESCOWN_ATTR_VALUE_START
 #define WID_NUMLEVELOWN_ATTR_VALUE_START+1
 #define WID_PORTIONTYPE OWN_ATTR_VALUE_START+2
@@ -145,7 +137,7 @@ class SvxItemPropertySet;
 {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LMARGIN),  EE_PARA_LRSPACE,   
 ::getCppuType((const sal_Int32*)0),0, 
MID_TXT_LMARGIN|SFX_METRIC_ITEM }, \
 {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_LINESPACING),  EE_PARA_SBL,   
 ::getCppuType((const ::com::sun::star::style::LineSpacing*)0), 0, 0 }, \
 {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_RMARGIN),  EE_PARA_LRSPACE,   
 ::getCppuType((const sal_Int32*)0),0, 
MID_R_MARGIN|SFX_METRIC_ITEM }, \
-{MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS,  
 SEQTYPE(::getCppuType((const ::com::sun::star::uno::Sequence 
::com::sun::star::style::TabStop *)0)), 0, 0 }, \
+{MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TAPSTOPS), EE_PARA_TABS,  
 ::getCppuType((const ::com::sun::star::uno::Sequence 
::com::sun::star::style::TabStop *)0), 0, 0 }, \
 {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_TMARGIN),  EE_PARA_ULSPACE,   
 ::getCppuType((const sal_Int32*)0),0, 
MID_UP_MARGIN|SFX_METRIC_ITEM },\
 {MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT), EE_PARA_LRSPACE,  
 ::getCppuType((const sal_Int32*)0),0, 
MID_FIRST_LINE_INDENT|SFX_METRIC_ITEM}, \
 
{MAP_CHAR_LEN(UNO_NAME_EDIT_PARA_IS_HANGING_PUNCTUATION),EE_PARA_HANGINGPUNCTUATION,
::getBooleanCppuType(),0 ,0 }, \
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 7a44c74..f5f0b99 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -74,14 +74,6 @@
 
 #include svx/svxids.hrc
 
-#ifndef SEQTYPE
- #if defined(__SUNPRO_CC)  (__SUNPRO_CC == 0x500)
-  #define SEQTYPE(x) (new ::com::sun::star::uno::Type( x ))
- #else
-  #define SEQTYPE(x) (x)
- #endif
-#endif
-
 #define OWN_ATTR_VALUE_START_TEXT   (OWN_ATTR_VALUE_START+0)// 
the next 10 entries are reserved for text
 #define OWN_ATTR_VALUE_POLYGONKIND  (OWN_ATTR_VALUE_START+10)
 #define OWN_ATTR_VALUE_POLYPOLYGON  (OWN_ATTR_VALUE_START+11)
@@ -229,9 +221,9 @@
 LINE_PROPERTIES_DEFAULTS
 
 #define LINE_PROPERTIES_START_END \
-{ MAP_CHAR_LEN(UNO_NAME_LINEEND),   XATTR_LINEEND,  
SEQTYPE(::getCppuType((const 
::com::sun::star::drawing::PolyPolygonBezierCoords*)0)),   
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
+{ MAP_CHAR_LEN(UNO_NAME_LINEEND),   XATTR_LINEEND,  
::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),   
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, \
 { MAP_CHAR_LEN(LineEndName),  XATTR_LINEEND,  
::getCppuType((const OUString*)0), 0, MID_NAME }, \
-{ MAP_CHAR_LEN(UNO_NAME_LINESTART), XATTR_LINESTART,
SEQTYPE(::getCppuType((const 
::com::sun::star::drawing::PolyPolygonBezierCoords*)0)),   
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},  \
+{ MAP_CHAR_LEN(UNO_NAME_LINESTART), XATTR_LINESTART,
::getCppuType((const ::com::sun::star::drawing::PolyPolygonBezierCoords*)0),   
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},  \
 { MAP_CHAR_LEN(LineStartName),XATTR_LINESTART,
::getCppuType((const OUString*)0), 0, MID_NAME },
 
 #define FILL_PROPERTIES_BMP \
@@ -311,12 +303,12 @@
 { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_FRAMERECT),OWN_ATTR_FRAMERECT,
 ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0,  

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

[Caolán McNamara]

 include/svx/dialogs.hrc   |1 
 svx/UIConfig_svx.mk   |1 
 svx/inc/extrusiondepthdialog.hxx  |7 -
 svx/source/tbxctrls/extrusioncontrols.cxx |   20 ---
 svx/source/tbxctrls/extrusioncontrols.hrc |2 
 svx/source/tbxctrls/extrusioncontrols.src |   57 --
 svx/uiconfig/ui/extrustiondepthdialog.ui  |  156 ++
 7 files changed, 163 insertions(+), 81 deletions(-)

New commits:
commit ab80ea279bea37f4dd919417433cfd72ca28e8bd
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 11:21:02 2013 +

Related: fdo#34396 convert extrusion dialog to .ui

Change-Id: Iea6e42fb7b65e148dcf6b566a7595b9e18f2e2eb

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 4c3d681..7c89bb7 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1020,7 +1020,6 @@
 // ModalDialog resource ids
 
 #define RID_SVX_MDLG_FONTWORK_GALLERY   ( RID_SVX_START +  2 )
-#define RID_SVX_MDLG_EXTRUSION_DEPTH( RID_SVX_START +  3 )
 
 // 
 // Menu resource ids
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index fb29eb1..7662784 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/compressgraphicdialog \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
+   svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/linkwarndialog \
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 30765b9..43bafe5 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -31,15 +31,10 @@ namespace svx {
 
 class ExtrusionDepthDialog : public ModalDialog
 {
-FixedText   maFLDepth;
-MetricField maMtrDepth;
-OKButtonmaOKButton;
-CancelButtonmaCancelButton;
-HelpButton  maHelpButton;
+MetricField* m_pMtrDepth;
 
 public:
 ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit 
eDefaultUnit );
-~ExtrusionDepthDialog();
 
 double getDepth() const;
 };
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 9a98163..8ebf54e 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -297,27 +297,17 @@ Sequence OUString  SAL_CALL 
ExtrusionDirectionControl::getSupportedServiceName
 // 
 
 ExtrusionDepthDialog::ExtrusionDepthDialog( Window* pParent, double fDepth, 
FieldUnit eDefaultUnit )
-:   ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_EXTRUSION_DEPTH ) ),
-maFLDepth( this, SVX_RES( FL_DEPTH ) ),
-maMtrDepth( this, SVX_RES( MTR_DEPTH ) ),
-maOKButton( this, SVX_RES( BTN_OK ) ),
-maCancelButton( this, SVX_RES( BTN_CANCEL ) ),
-maHelpButton( this, SVX_RES( BTN_HELP ) )
+: ModalDialog( pParent, ExtrustionDepthDialog, 
svx/ui/extrustiondepthdialog.ui )
 {
+get(m_pMtrDepth, depth);
 bool bMetric = IsMetric( eDefaultUnit );
-maMtrDepth.SetUnit( bMetric ? FUNIT_CM : FUNIT_INCH );
-maMtrDepth.SetValue( (int) fDepth * 100, FUNIT_100TH_MM );
-
-FreeResource();
-}
-
-ExtrusionDepthDialog::~ExtrusionDepthDialog()
-{
+m_pMtrDepth-SetUnit( bMetric ? FUNIT_CM : FUNIT_INCH );
+m_pMtrDepth-SetValue( (int) fDepth * 100, FUNIT_100TH_MM );
 }
 
 double ExtrusionDepthDialog::getDepth() const
 {
-return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0;
+return (double)( m_pMtrDepth-GetValue( FUNIT_100TH_MM ) ) / 100.0;
 }
 
 // 
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc 
b/svx/source/tbxctrls/extrusioncontrols.hrc
index f878df2..6193cca 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
@@ -80,8 +80,6 @@
 #define IMG_LIGHTING_NORMAL 111
 #define IMG_LIGHTING_DIM112
 
-#define FL_DEPTH1
-#define MTR_DEPTH   2
 #define BTN_OK  3
 #define BTN_CANCEL  4
 #define BTN_HELP5
diff --git a/svx/source/tbxctrls/extrusioncontrols.src 
b/svx/source/tbxctrls/extrusioncontrols.src
index 5277076..3600a28 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -430,63 +430,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
 };
 };
 
-#define WIDTH   140
-#define HEIGHT  (4 * 3 + 3 * 14)
-
-ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
-{
-HelpID = svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH;
-OutputSize = TRUE;
-SVLook = TRUE ;
-Moveable = TRUE;
-

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a41d064568f3e69238a60c0df803c746b03b2b34
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 11:33:40 2013 +

Updated core
Project: help  a06c9b3125bb3329c6bf0209aee7b7f93f25136c

diff --git a/helpcontent2 b/helpcontent2
index 669b943..a06c9b3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 669b94349794029c207147d7d3702540a44f8444
+Subproject commit a06c9b3125bb3329c6bf0209aee7b7f93f25136c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst  |2 --
 source/text/shared/3dsettings_toolbar.xhp |4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a06c9b3125bb3329c6bf0209aee7b7f93f25136c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 11:33:40 2013 +

update help ids for extrustion depth dialog .ui conversion

Change-Id: I25386aedc7dbc72db343ff32a06300d00d5e96c2

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8ea4855..971c18d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6839,7 +6839,6 @@ 
svx_MetricField_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_HEIGHT,1243027
 
svx_MetricField_RID_SVX_GRFFILTER_DLG_MOSAIC_DLG_FILTERMOSAIC_MTR_WIDTH,1243027970,
 
svx_MetricField_RID_SVX_GRFFILTER_DLG_SEPIA_DLG_FILTERSEPIA_MTR_SEPIA,1243060738,
 
svx_MetricField_RID_SVX_GRFFILTER_DLG_SOLARIZE_DLG_FILTERSOLARIZE_MTR_THRESHOLD,1243044354,
-svx_MetricField_RID_SVX_MDLG_EXTRUSION_DEPTH_MTR_DEPTH,1237637634,
 svx_MetricField_RID_SVX_MDLG_FONTWORK_CHARSPACING_MF_VALUE,1237899783,
 svx_ModalDialog_DLG_CHINESEDICTIONARY,1078673408,
 svx_ModalDialog_DLG_CHINESETRANSLATION,1078657024,
@@ -6859,7 +6858,6 @@ 
svx_ModalDialog_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE,1241268224,
 svx_ModalDialog_RID_SVXDLG_SETFORM,1368735744,
 svx_ModalDialog_RID_SVX_DLG_INPUTRECORDNO,1368817664,
 svx_ModalDialog_RID_SVX_DLG_SHOWGRIDCOLUMNS,1368834048,
-svx_ModalDialog_RID_SVX_MDLG_EXTRUSION_DEPTH,1237630976,
 svx_ModalDialog_RID_SVX_MDLG_FONTWORK_CHARSPACING,1237893120,
 svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592,
 svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336,
diff --git a/source/text/shared/3dsettings_toolbar.xhp 
b/source/text/shared/3dsettings_toolbar.xhp
index c7bd573..831ffd0 100644
--- a/source/text/shared/3dsettings_toolbar.xhp
+++ b/source/text/shared/3dsettings_toolbar.xhp
@@ -57,7 +57,7 @@
 paragraph xml-lang=en-US id=par_idN105FC role=heading level=2 
l10n=NEWDepth/paragraph
   paragraph xml-lang=en-US id=par_idN10600 role=paragraph 
l10n=NEWahelp hid=.Opens the Extrusion Depth window./ahelp/paragraph
   paragraph xml-lang=en-US id=par_idN10617 role=paragraph 
l10n=NEWahelp hid=.Select an extrusion depth./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/svx:MetricField:RID_SVX_MDLG_EXTRUSION_DEPTH:MTR_DEPTH 
id=bm_id5449079 localize=false/
+bookmark xml-lang=en-US 
branch=hid/svx/ui/extrustiondepthdialog/ExtrustionDepthDialog 
id=bm_id5449079 localize=false/
 paragraph xml-lang=en-US id=par_idN10632 role=paragraph 
l10n=NEWahelp hid=.Enter an extrusion depth./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/.uno:ExtrusionDirectionFloater 
id=bm_id6154362 localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:ExtrusionDirectionFloater 
id=bm_id3699453 localize=false/
@@ -82,4 +82,4 @@
 paragraph xml-lang=en-US id=par_idN10732 role=heading level=2 
l10n=NEW3D Color/paragraph
   paragraph xml-lang=en-US id=par_idN10736 role=paragraph 
l10n=NEWahelp hid=.Opens the Extrusion Color toolbar./ahelp/paragraph
/body
-/helpdocument
\ No newline at end of file
+/helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: I have some questions for libreoffice development.

[Michael Stahl]

On 05/12/13 11:34, 刘先洋 wrote:
 - - !
 When create a selection, attach a comment to that, I get the following
 output:
 Inline image 2
 Inline image 3
 Inline image 1
 
 I did not find the fieldmark.Confused.

that is expected - the annotation with start and end is a special case
that can already be represented with ODF 1.2 with the
office:annotation-end element; all other types of fieldmark cannot.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/tbxctrls/extrusioncontrols.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3440440dbf433d98673d114959d862d6bbcf5de2
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 11:44:05 2013 +

Resolves: fdo#34396 use default units in extrusion depth dialog

Change-Id: I43b80d0fd70c97f923977aa1d496e9ed7d9a61f1

diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 8ebf54e..0ff5b92 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -300,8 +300,7 @@ ExtrusionDepthDialog::ExtrusionDepthDialog( Window* 
pParent, double fDepth, Fiel
 : ModalDialog( pParent, ExtrustionDepthDialog, 
svx/ui/extrustiondepthdialog.ui )
 {
 get(m_pMtrDepth, depth);
-bool bMetric = IsMetric( eDefaultUnit );
-m_pMtrDepth-SetUnit( bMetric ? FUNIT_CM : FUNIT_INCH );
+m_pMtrDepth-SetUnit( eDefaultUnit );
 m_pMtrDepth-SetValue( (int) fDepth * 100, FUNIT_100TH_MM );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/aqua

[Tor Lillqvist]

 vcl/aqua/source/window/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab27cf774edc3c27c2be181e1cb1a67a4551536f
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 13:57:05 2013 +0200

Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: Iffa0c948356e705f610e057892c84d43d0d3490b

diff --git a/vcl/aqua/source/window/salframe.cxx 
b/vcl/aqua/source/window/salframe.cxx
index 5b8126d..0a9081e 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -217,7 +217,7 @@ void AquaSalFrame::initWindowAndView()
 objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
 }
 NSRect aRect = { { 0,0 }, { static_castCGFloat(maGeometry.nWidth), 
static_castCGFloat(maGeometry.nHeight) } };
-mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: 
nil assumeInside: NO];
+mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView 
userData: nil assumeInside: NO];
 
 maSysData.mpNSView = mpNSView;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/sfx2 sdext/source sd/source sfx2/source sw/inc sw/qa sw/source writerfilter/source

[Michael Stahl]

 include/sfx2/objsh.hxx   |   10 -
 sd/source/ui/docshell/docshel4.cxx   |5 +-
 sd/source/ui/inc/DrawDocShell.hxx|4 +-
 sdext/source/pdfimport/pdfiadaptor.cxx   |   14 ++-
 sfx2/source/doc/objstor.cxx  |   60 +++
 sw/inc/docsh.hxx |3 +
 sw/qa/extras/rtfimport/rtfimport.cxx |4 +-
 sw/source/filter/rtf/swparrtf.cxx|4 +-
 sw/source/ui/app/docsh.cxx   |   17 
 sw/source/ui/uiview/view2.cxx|7 +++
 writerfilter/source/filter/RtfFilter.cxx |2 -
 11 files changed, 96 insertions(+), 34 deletions(-)

New commits:
commit fb9d14f6a6deb00ecd09288e5696e8df7f8f5c0e
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 5 12:57:01 2013 +0100

RTF: use InsertMode insead of IsNewDoc for consistency

... with other filters.

Change-Id: I563d6f7713d882b834978699c492a43a70e072cd

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 88df7ad..95a3a09 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -91,8 +91,8 @@ protected:
 SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(getURLFromSrc(/sw/qa/extras/rtfimport/data/)
 + aFilename, STREAM_WRITE);
 uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStream));
 aDescriptor[0].Value = xStream;
-aDescriptor[1].Name = IsNewDoc;
-aDescriptor[1].Value = sal_False;
+aDescriptor[1].Name = InsertMode;
+aDescriptor[1].Value = sal_True;
 if (xTextRange.is())
 {
 aDescriptor[2].Name = TextInsertModeRange;
diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index cfbc915..aad6a8d 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -87,8 +87,8 @@ sal_uLong SwRTFReader::Read( SwDoc rDoc, const OUString 
/*rBaseURL*/, SwPaM r
 aDescriptor[0].Name = InputStream;
 uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStrm));
 aDescriptor[0].Value = xStream;
-aDescriptor[1].Name = IsNewDoc;
-aDescriptor[1].Value = sal_False;
+aDescriptor[1].Name = InsertMode;
+aDescriptor[1].Value = sal_True;
 aDescriptor[2].Name = TextInsertModeRange;
 aDescriptor[2].Value = xInsertTextRange;
 sal_uLong ret(0);
diff --git a/writerfilter/source/filter/RtfFilter.cxx 
b/writerfilter/source/filter/RtfFilter.cxx
index 54bc27b..6093211 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -75,7 +75,7 @@ sal_Bool RtfFilter::filter( const uno::Sequence 
beans::PropertyValue  aDescri
 {
 MediaDescriptor aMediaDesc( aDescriptor );
 bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault( 
RepairPackage, false );
-bool bIsNewDoc = aMediaDesc.getUnpackedValueOrDefault( IsNewDoc, 
true );
+bool bIsNewDoc = !aMediaDesc.getUnpackedValueOrDefault(InsertMode, 
false);
 uno::Referencetext::XTextRange xInsertTextRange = 
aMediaDesc.getUnpackedValueOrDefault( TextInsertModeRange, 
uno::Referencetext::XTextRange());
 #ifdef DEBUG_IMPORT
 OUString sURL = aMediaDesc.getUnpackedValueOrDefault( 
MediaDescriptor::PROP_URL(), OUString() );
commit c5138cad87575283cdf0670355f2b2cddae93fc8
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 5 12:15:15 2013 +0100

fdo#68724: sw: fix crash on Insert-File with Hybrid PDF

This is an unfortunate combination of 2 special cases:
- the Hybrid PDF has its own XFilter implementation to extract the
  embedded ODF document
- Writer needs to create a SwReader with SwPaM for Insert

Since the PDF XFilter uses a special service in sfx2 to implement
the import, handling this requires a new method in SfxObjectShell
that calls back into Writer to create the properly setup SwReader.

Change-Id: Ie85f3bfa322bfe883c479e1cb198a8bf0cbbac23

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index fac2625..de041fbf 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -116,6 +116,9 @@ namespace com { namespace sun { namespace star {
 namespace lang {
 class XComponent;
 }
+namespace text {
+class XTextRange;
+}
 } } }
 
 typedef sal_uInt32 SfxObjectShellFlags;
@@ -348,7 +351,12 @@ public:
 sal_Bool bForceNonModified = sal_False );
 sal_BoolSaveCompletedChildren( sal_Bool bSuccess );
 
-virtual sal_BoolImportFrom( SfxMedium rMedium, bool bInsert );
+/** a very special case to insert at a position in Writer from UNO,
+via OwnSubFilterService */
+virtual boolInsertGeneratedStream(SfxMedium rMedium,
+css::uno::Referencecss::text::XTextRange const xInsertPosition);
+virtual bool

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 62461, which changed state.

Bug 62461 Summary: LO-4.x.x creates new ODT, ODP and ODG file with fallback PNG 
graphic first, if an SVG picture inserted into the file
https://bugs.freedesktop.org/show_bug.cgi?id=62461

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Andrzej J . R . Hunt]

 vcl/source/gdi/gdimtf.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit be7d87bea2611eb316b9b379aebc031179d4f794
Author: Andrzej J.R. Hunt andrzej.h...@collabora.com
Date:   Thu Dec 5 11:36:53 2013 +

EMF+: force canvas if EMF+ comments are used.

Without this the drawinglayer renderer is used, whereas
only the canvas renderer supports EMF+.

Change-Id: Id8a10e400e08c1913e7d6864a51f7b73fc9be437

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 820f2a0..1d89dea 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2765,6 +2765,13 @@ SvStream operator( SvStream rIStm, GDIMetaFile 
rGDIMetaFile )
 {
 pAction = MetaAction::ReadMetaAction( rIStm, aReadData );
 
+if (pAction-GetType() == META_COMMENT_ACTION)
+{
+MetaCommentAction* pCommentAct = 
static_castMetaCommentAction*(pAction);
+if ( pCommentAct-GetComment() == EMF_PLUS )
+rGDIMetaFile.UseCanvas( sal_True );
+}
+
 if( pAction )
 rGDIMetaFile.AddAction( pAction );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

[Andrzej J . R . Hunt]

 vcl/source/gdi/gdimtf.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit daa2340716bcc8a2bea32e4f3e91f34da8fa7224
Author: Andrzej J.R. Hunt andrzej.h...@collabora.com
Date:   Thu Dec 5 11:36:53 2013 +

EMF+: force canvas if EMF+ comments are used.

Without this the drawinglayer renderer is used, whereas
only the canvas renderer supports EMF+.

Change-Id: Id8a10e400e08c1913e7d6864a51f7b73fc9be437
(cherry picked from commit be7d87bea2611eb316b9b379aebc031179d4f794)

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 820f2a0..1d89dea 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2765,6 +2765,13 @@ SvStream operator( SvStream rIStm, GDIMetaFile 
rGDIMetaFile )
 {
 pAction = MetaAction::ReadMetaAction( rIStm, aReadData );
 
+if (pAction-GetType() == META_COMMENT_ACTION)
+{
+MetaCommentAction* pCommentAct = 
static_castMetaCommentAction*(pAction);
+if ( pCommentAct-GetComment() == EMF_PLUS )
+rGDIMetaFile.UseCanvas( sal_True );
+}
+
 if( pAction )
 rGDIMetaFile.AddAction( pAction );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - vcl/source

[Andrzej J . R . Hunt]

 vcl/source/gdi/gdimtf.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d209348d849aa6e4c01ed0928186e50c466e8c67
Author: Andrzej J.R. Hunt andrzej.h...@collabora.com
Date:   Thu Dec 5 11:36:53 2013 +

EMF+: force canvas if EMF+ comments are used.

Without this the drawinglayer renderer is used, whereas
only the canvas renderer supports EMF+.

Change-Id: Id8a10e400e08c1913e7d6864a51f7b73fc9be437
(cherry picked from commit be7d87bea2611eb316b9b379aebc031179d4f794)

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 0b6daac..7b4c91b 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2896,6 +2896,13 @@ SvStream operator( SvStream rIStm, GDIMetaFile 
rGDIMetaFile )
 {
 pAction = MetaAction::ReadMetaAction( rIStm, aReadData );
 
+if (pAction-GetType() == META_COMMENT_ACTION)
+{
+MetaCommentAction* pCommentAct = 
static_castMetaCommentAction*(pAction);
+if ( pCommentAct-GetComment() == EMF_PLUS )
+rGDIMetaFile.UseCanvas( sal_True );
+}
+
 if( pAction )
 rGDIMetaFile.AddAction( pAction );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/sfx2 sd/source sfx2/source sw/inc sw/source

[Michael Stahl]

 include/sfx2/objsh.hxx |   10 +-
 sd/source/ui/docshell/docshel4.cxx |5 +--
 sd/source/ui/inc/DrawDocShell.hxx  |4 +-
 sfx2/source/doc/objstor.cxx|   60 +++--
 sw/inc/docsh.hxx   |3 +
 sw/source/ui/app/docsh.cxx |   17 ++
 sw/source/ui/uiview/view2.cxx  |7 +++-
 7 files changed, 86 insertions(+), 20 deletions(-)

New commits:
commit c190ee1e5523c8de9b1a536fcfa842824b66e3de
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 5 12:15:15 2013 +0100

fdo#68724: sw: fix crash on Insert-File with Hybrid PDF

This is an unfortunate combination of 2 special cases:
- the Hybrid PDF has its own XFilter implementation to extract the
  embedded ODF document
- Writer needs to create a SwReader with SwPaM for Insert

Since the PDF XFilter uses a special service in sfx2 to implement
the import, handling this requires a new method in SfxObjectShell
that calls back into Writer to create the properly setup SwReader.

Change-Id: Ie85f3bfa322bfe883c479e1cb198a8bf0cbbac23
(cherry picked from commit c5138cad87575283cdf0670355f2b2cddae93fc8)

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index fac2625..de041fbf 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -116,6 +116,9 @@ namespace com { namespace sun { namespace star {
 namespace lang {
 class XComponent;
 }
+namespace text {
+class XTextRange;
+}
 } } }
 
 typedef sal_uInt32 SfxObjectShellFlags;
@@ -348,7 +351,12 @@ public:
 sal_Bool bForceNonModified = sal_False );
 sal_BoolSaveCompletedChildren( sal_Bool bSuccess );
 
-virtual sal_BoolImportFrom( SfxMedium rMedium, bool bInsert );
+/** a very special case to insert at a position in Writer from UNO,
+via OwnSubFilterService */
+virtual boolInsertGeneratedStream(SfxMedium rMedium,
+css::uno::Referencecss::text::XTextRange const xInsertPosition);
+virtual boolImportFrom( SfxMedium rMedium,
+css::uno::Referencecss::text::XTextRange const xInsertPosition);
 sal_BoolExportTo( SfxMedium rMedium );
 
 // xmlsec05, check with SFX team
diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 514d8fc..9012869 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -374,9 +374,10 @@ sal_Bool DrawDocShell::LoadFrom( SfxMedium rMedium )
 /**
  * load from 3rd party format
  */
-sal_Bool DrawDocShell::ImportFrom( SfxMedium rMedium, bool bInsert )
+bool DrawDocShell::ImportFrom(SfxMedium rMedium,
+uno::Referencetext::XTextRange const xInsertPosition)
 {
-const sal_Bool bRet=SfxObjectShell::ImportFrom(rMedium, bInsert);
+const sal_Bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition);
 
 SfxItemSet* pSet = rMedium.GetItemSet();
 if( pSet )
diff --git a/sd/source/ui/inc/DrawDocShell.hxx 
b/sd/source/ui/inc/DrawDocShell.hxx
index e4c7ee6..3045701 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -76,7 +76,9 @@ public:
 virtual voidActivate( sal_Bool bMDI );
 virtual voidDeactivate( sal_Bool bMDI );
 virtual sal_BoolInitNew( const 
::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage  xStorage 
);
-virtual sal_BoolImportFrom( SfxMedium rMedium, bool bInsert=false 
);
+virtual boolImportFrom(SfxMedium rMedium,
+css::uno::Referencecss::text::XTextRange const xInsertPosition)
+SAL_OVERRIDE;
 virtual sal_BoolConvertFrom( SfxMedium rMedium );
 virtual sal_BoolSave();
 virtual sal_BoolSaveAsOwnFormat( SfxMedium rMedium );
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 125edca..df12f4f 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -66,6 +66,7 @@
 #include com/sun/star/io/XTruncate.hpp
 #include com/sun/star/util/XModifiable.hpp
 #include com/sun/star/security/DocumentDigitalSignatures.hpp
+#include com/sun/star/text/XTextRange.hpp
 #include com/sun/star/xml/crypto/CipherID.hpp
 #include com/sun/star/xml/crypto/DigestID.hpp
 
@@ -548,7 +549,7 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
 
 sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl(
 const uno::Reference io::XStream  xStream,
-const uno::Sequence beans::PropertyValue  aMediaDescr )
+const uno::Sequence beans::PropertyValue  rMediaDescr )
 {
 if ( !xStream.is() )
 return sal_False;
@@ -572,22 +573,38 @@ sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl(
 pMedium-SetStorage_Impl( xStorage );
 
 SfxAllItemSet aSet( 

[Libreoffice-commits] core.git: extensions/source

[Tor Lillqvist]

 extensions/source/plugin/aqua/sysplug.mm  |2 +-
 extensions/source/plugin/base/xplugin.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0fb67dfdb6493cb7f6fc3b97af938300f1891af4
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 14:46:03 2013 +0200

Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: Ic4dc1c106ebcce7d27844551efca43cabb31c4ae

diff --git a/extensions/source/plugin/aqua/sysplug.mm 
b/extensions/source/plugin/aqua/sysplug.mm
index 366c8d5..304e716 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -82,7 +82,7 @@ struct SysPlugData
 
 void XPlugin_Impl::SetSysPlugDataParentView(SystemEnvData const rEnvData)
 {
-m_pSysPlugData-m_pParentView = rEnvData.pView;
+m_pSysPlugData-m_pParentView = rEnvData.mpNSView;
 }
 
 extern C {
diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index 3702813..924af39 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -528,7 +528,7 @@ void XPlugin_Impl::loadPlugin()
 #if defined MACOSX
 PluginComm* pComm = new MacPluginComm( m_aDescription.Mimetype,
m_aDescription.PluginName,
-   pEnvData-pView );
+   pEnvData-mpNSView );
 #elif defined UNX
 // need a new PluginComm
 PluginComm* pComm = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo69552 backward compatibility with optional arguments in calc functions

[Eike Rathke]

Hi Winfried,

On Wednesday, 2013-12-04 09:39:57 +0100, Winfried Donkers wrote:

 1) for the next release (4.3) implement a second function named a little
different in the UI (e.g. CEILING_ODF) with the correct handling of
parameters, do not offer it in the FunctionWizard yet (there's a flag
in scfuncs.src to suppress functions and their descriptions) and when
reading from an ODF document a function that does not have the
optional but so far expected parameter map it to the new function
(CEILING_ODF), else map it to the old function (CEILING). Both are
saved as CEILING again in ODF without intervention, not changing
anything. This enables a release to read and handle future versions
(or correct ODF files).
 
 formula/source/core/resource/core_resource.src has a one-to-one relation of 
 opcode and function name.
 Can you tell me how to map a function in a saved ODF document to one or 
 another function? 

Has to be done as special cases in the compiler, when compiling probably
in FormulaCompiler::Factor(), when creating names from opcodes in
FormulaCompiler::CreateStringFromToken(). The additional UI strings
could be placed in an extra Resource of
formula/source/core/resource/core_resource.src to not interfere with the
existing mapping.

 And if this can be done, can't we do this the other way round as well?

Sure, but we don't want that ;-)

 I mean using the function CEILING in the UI and saving it as CEILING or 
 CEILING_ODF depending on the used arguments and when reading a file 
 converting both CEILING and CEILING_ODF to CEILING in the UI.

No, saving as another function additionally to CEILING would mean that
all other consumers of the file would not know it.

 Wiki would be best, as a subpage of .../Development/Calc/ and categorize
 it as [[Category:Calc|{{SUBPAGENAME}}]]
 Maybe also as a subpage of .../Development/Calc/Spreadsheet_Functions/
 
 As the wikis are public from the moment it is written, I intend to send the 
 text to you/the mailinglist  for review first.
 But, of course, the changes for each release need to be defined first ;)

Don't be afraid of the wiki ;-)  The first version version of a page
doesn't have to be perfect, we can always edit it, nothing to be scared
of..

Anyhow, I'll create a page and initialize it with my previous
brainstorm.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpAmgDqAS0Ks.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: avmedia/source

[Tor Lillqvist]

 avmedia/source/vlc/vlcplayer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92b1348ae8e0b0cd8fa5dca34ce55fc01dc6e02f
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 14:59:10 2013 +0200

Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: I9ed9c29c7a0a409ca38a71a2046c4b5be8caad17

diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 64ad897..952f38c 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -177,7 +177,7 @@ namespace
 return -1;
 
 #if defined MACOSX
-const intptr_t id = reinterpret_castintptr_t( pEnvData-pView );
+const intptr_t id = reinterpret_castintptr_t( pEnvData-mpNSView );
 #elif defined WNT
 const intptr_t id = reinterpret_castintptr_t( pEnvData-hWnd );
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/inc/swmodeltestbase.hxx  |4 +++-
 sw/qa/extras/ooxmlimport/data/mce-wpg.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |9 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 8c73b16f5f18f3bc1dbf9ff6c1475db56b44d304
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 14:00:52 2013 +0100

DOCX import: declare wpg as a supported feature

This is the same as wps, just for group shapes.

Change-Id: I321b19ed538a6cb8f9068c7de6fbe9a8eb0bd82f

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 57d40c6..0a5418a 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -351,9 +351,11 @@ protected:
 return xParagraph;
 }
 
-uno::Referencetext::XTextRange getParagraphOfText(int number, 
uno::Referencetext::XText xText) const
+uno::Referencetext::XTextRange getParagraphOfText(int number, 
uno::Referencetext::XText xText, OUString content = OUString()) const
 {
 uno::Referencetext::XTextRange const 
xParagraph(getParagraphOrTable(number, xText), uno::UNO_QUERY_THROW);
+if (!content.isEmpty())
+CPPUNIT_ASSERT_EQUAL(content, xParagraph-getString());
 return xParagraph;
 }
 
diff --git a/sw/qa/extras/ooxmlimport/data/mce-wpg.docx 
b/sw/qa/extras/ooxmlimport/data/mce-wpg.docx
new file mode 100755
index 000..bd0d846
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/mce-wpg.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6d9837e..bd7b180 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1574,6 +1574,15 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, 
textbox-wpg-only.docx)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(100), 
getPropertysal_Int32(getRun(getParagraphOfText(1, xText), 1), 
CharEscapementHeight));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testMceWpg, mce-wpg.docx)
+{
+// Make sure that we read the primary branch, if wpg is requested as a 
feature.
+uno::Referencecontainer::XIndexAccess xGroup(getShape(1), 
uno::UNO_QUERY);
+uno::Referencetext::XText xText = 
uno::Referencetext::XTextRange(xGroup-getByIndex(0), 
uno::UNO_QUERY)-getText();
+// This was VML1.
+getParagraphOfText(1, xText, DML1);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
 {
 // The document contains a rotated bitmap
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 78a4460..ed1ae17 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -198,6 +198,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t 
nElement, const uno::Ref
 OUString aRequires = rAttribs-getOptionalValue(OOXML_Requires);
 static const char* aFeatures[] = {
 wps,
+wpg,
 };
 for (size_t i = 0; i  SAL_N_ELEMENTS(aFeatures); ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: slideshow/source

[Tor Lillqvist]

 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b415ec8cad8224c58d149626ddc3365575aa855e
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 15:27:50 2013 +0200

Fix fallout from 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5

Change-Id: I9df591c084175848bb58a97db2241f18cbe53db2

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm 
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 70417c7..e4b7f22 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -366,7 +366,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( 
const Reference presenta
  
 const SystemEnvData* sysData(pPWindow-GetSystemData());
 
-GLWin.apView = sysData-pView;
+GLWin.apView = sysData-mpNSView;
 
 NSOpenGLPixelFormat* fmt = [AquaOpenGLView defaultPixelFormat];
 Window *pFrameWindow = pPWindow-GetWindow(WINDOW_FRAME);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype

[David Tardon]

 bin/get-bugzilla-attachments-by-mimetype |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 46ae91a2665e4f56bd87a98e51dd24f4de881ccf
Author: David Tardon dtar...@redhat.com
Date:   Thu Dec 5 13:27:09 2013 +0100

fetch abiword bz attachments (for future use)

Change-Id: I8a18265ecd6a48f35980f335b2da5fe59958c02c

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 9e108ff..03b9f32 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -323,6 +323,7 @@ mimetypes = {
 'application/x-pocket-word': 'psw',
 'application/x-t602': '602',
 'application/x-fictionbook+xml': 'fb2',
+'application/x-abiword': 'abw',
 # binfilter
 'application/x-starcalc': 'sdc',
 'application/vnd.stardivision.calc': 'sdc5',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Jan Holesovsky]

 sfx2/source/control/templateview.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e697cd8f82765ebf9005167a7b9d2680a774cb04
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 5 14:41:56 2013 +0100

Start center: Use the welcome text that was agreed by UX / design team.

Change-Id: I1af05f68ef7c2a10209f138e59a9245d3d1ac081

diff --git a/sfx2/source/control/templateview.src 
b/sfx2/source/control/templateview.src
index ef2eede..3b866bd 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -25,7 +25,7 @@ FixedText FT_NAME
 
 String STR_WELCOME
 {
-Text [ en-US ] = Welcome! You can open or create a new document!;
+Text [ en-US ] = Welcome to %PRODUCTNAME. Use the sidebar to open or 
create a file.;
 };
 
 Image IMG_WELCOME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - include/oox include/vcl sc/source

[Michael Meeks]

 include/oox/helper/progressbar.hxx|4 -
 include/vcl/timer.hxx |3 -
 sc/source/filter/inc/worksheethelper.hxx  |   11 +++
 sc/source/filter/oox/workbookfragment.cxx |   87 +++---
 sc/source/filter/oox/worksheethelper.cxx  |   59 +++-
 5 files changed, 139 insertions(+), 25 deletions(-)

New commits:
commit 71af63ceac36d0f9488b2ca8cdbe1b2f783ed41d
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Dec 4 16:09:33 2013 +

oox: remove debugging printf.

Change-Id: I79198f926cad736549f3251ea92971374b305999

diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 2baf11d..cb3d683 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -294,7 +294,6 @@ public:
 }
 virtual void Timeout()
 {
-fprintf( stderr, Progress bar update\n );
 for( size_t i = 0; i  aSegments.size(); i++)
 static_cast ProgressWrapper *( aSegments[ i ].get() 
)-UpdateBar();
 }
commit 5c85cc008507eceed97283f84924ea33e0651f9d
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Dec 4 15:00:36 2013 +

oox: render progress bar in main thread for threaded import.

Experimental only.

This avoids ,us deadlocking as the main thread tries to join it's children,
and the child threads wait to 'Yield' in the progress bar update.
Also it's generally safer to move progress reporting out of the other
threads, and to have the mainloop spinning here.
Finally  this allows people to continue to use the LibreOffice suite while
large XLSX spreadsheets are loading.

Change-Id: Id41c18f3941d6fc5eea593f7cfcf6a8b7215b3f8

diff --git a/include/oox/helper/progressbar.hxx 
b/include/oox/helper/progressbar.hxx
index 1f61058..cdcbd0f 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -35,7 +35,7 @@ namespace oox {
 
 /** Interface for progress bar classes.
  */
-class IProgressBar
+class OOX_DLLPUBLIC IProgressBar
 {
 public:
 virtual ~IProgressBar();
@@ -66,7 +66,7 @@ typedef ::boost::shared_ptr ISegmentProgressBar  
ISegmentProgressBarRef;
 /** Interface for a segment in a progress bar, that is able to create sub
 segments from itself.
  */
-class ISegmentProgressBar : public IProgressBar
+class OOX_DLLPUBLIC ISegmentProgressBar : public IProgressBar
 {
 public:
 virtual ~ISegmentProgressBar();
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index ff9a4cf..a5b1c95 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -46,7 +46,8 @@ public:
 voidStart();
 voidStop();
 
-voidSetTimeout( sal_uLong nTimeout );
+/// set the timeout in milliseconds
+voidSetTimeout( sal_uLong nTimeoutMs );
 sal_uLong   GetTimeout() const { return mnTimeout; }
 sal_BoolIsActive() const { return mbActive ? sal_True : sal_False; 
}
 
diff --git a/sc/source/filter/inc/worksheethelper.hxx 
b/sc/source/filter/inc/worksheethelper.hxx
index bbcd152..9e23161 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -180,6 +180,14 @@ struct ValidationModel
 class WorksheetGlobals;
 typedef ::boost::shared_ptr WorksheetGlobals  WorksheetGlobalsRef;
 
+class IWorksheetProgress {
+public:
+virtual ~IWorksheetProgress() {}
+virtual ISegmentProgressBarRef getRowProgress() = 0;
+virtual void   setCustomRowProgress(
+const ISegmentProgressBarRef 
rxRowProgress ) = 0;
+};
+
 class WorksheetHelper : public WorkbookHelper
 {
 public:
@@ -191,6 +199,9 @@ public:
 WorksheetType eSheetType,
 sal_Int16 nSheet );
 
+// horrible accessor for hidden WorksheetGlobals ...
+static IWorksheetProgress *getWorksheetInterface( const 
WorksheetGlobalsRef xRef );
+
 // 
 
 /** Returns the type of this sheet. */
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index e666fa3..2baf11d 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -41,6 +41,7 @@
 #include viewsettings.hxx
 #include workbooksettings.hxx
 #include worksheetbuffer.hxx
+#include worksheethelper.hxx
 #include worksheetfragment.hxx
 #include sheetdatacontext.hxx
 #include threadpool.hxx
@@ -51,6 +52,7 @@
 #include calcconfig.hxx
 
 #include vcl/svapp.hxx
+#include vcl/timer.hxx
 
 #include oox/core/fastparser.hxx
 #include comphelper/processfactory.hxx
@@ -211,12 +213,15 @@ typedef std::vectorSheetFragmentHandler 
SheetFragmentVector;
 
 class WorkerThread : public ThreadTask
 {
+sal_Int32 mrSheetsLeft;
 

[Libreoffice-commits] core.git: sc/source

[Laurent Godard]

 sc/source/ui/unoobj/docuno.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit b561d6ef7d03f6d940d01367110f595deec7475c
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Thu Dec 5 12:04:31 2013 +0100

counting notes is per table, not on the whole document

Change-Id: Id4afa4eee961f159f8ea8caeac620d101cfb103e
Reviewed-on: https://gerrit.libreoffice.org/6941
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 56cd857..54f40d0 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3605,7 +3605,10 @@ sal_Int32 SAL_CALL ScAnnotationsObj::getCount() 
throw(uno::RuntimeException)
 if (pDocShell)
 {
 ScDocument* pDoc = pDocShell-GetDocument();
-nCount = pDoc-CountNotes();
+const ScRangeList aRangeList( ScRange( 0, 0, nTab, MAXCOL, MAXROW, 
nTab) );
+std::vectorsc::NoteEntry rNotes;
+pDoc-GetNotesInRange(aRangeList, rNotes);
+nCount = rNotes.size();
 }
 return nCount;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Please revert this commit...

[Regina Henschel]

Hi Stephan,

Stephan Bergmann schrieb:

On 12/05/2013 10:58 AM, Samuel Mehrbrodt wrote:

I have no idea what Now you cannot change the element by which you
navigate anymore means.


It's in the Navigator (F5) when you click the Navigation button
(second button in the first row). In the opened window you can jump to
the next/previous page with the buttons on the right.
If you click one of the other buttons, you change the element you
navigate by (e.g. Heading: Jump to next/previous heading).
Changing that hat no effect after you removed SetMoveType.


Ah; works again.


I had already written a bug report, see 
https://bugs.freedesktop.org/show_bug.cgi?id=72317. Please comment it.


Kind regards
Regina

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/uiconfig

[Eike Rathke]

 cui/uiconfig/ui/applylocalizedpage.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 958ec1b6e1b87c541521fd7faf2f72931c170702
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 15:01:58 2013 +0100

made button labels  '  andnon-translatable

These are the ASCII characters typed in that shall be auto-corrected to
typographic quotes defined in locale data. It makes no sense to
translate them.

Change-Id: Ied9c53950882b6dd3bf65a044c3ecc34bd5becaa

diff --git a/cui/uiconfig/ui/applylocalizedpage.ui 
b/cui/uiconfig/ui/applylocalizedpage.ui
index 019f12b..a588c96 100644
--- a/cui/uiconfig/ui/applylocalizedpage.ui
+++ b/cui/uiconfig/ui/applylocalizedpage.ui
@@ -153,7 +153,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=startsingle
-property name=label translatable=yes ' 
/property
+property name=label ' /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
@@ -236,7 +236,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=endsingle
-property name=label translatable=yes ' 
/property
+property name=label ' /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
@@ -353,7 +353,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=startdouble
-property name=label translatable=yes  
/property
+property name=label  /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
@@ -436,7 +436,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=enddouble
-property name=label translatable=yes  
/property
+property name=label  /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/uiconfig

[Eike Rathke]

 cui/uiconfig/ui/applylocalizedpage.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 798a9f8873189edab232d9f20007d5ab15ac74e5
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 15:01:58 2013 +0100

made button labels  '  andnon-translatable

These are the ASCII characters typed in that shall be auto-corrected to
typographic quotes defined in locale data. It makes no sense to
translate them.

Change-Id: Ied9c53950882b6dd3bf65a044c3ecc34bd5becaa
(cherry picked from commit 958ec1b6e1b87c541521fd7faf2f72931c170702)

diff --git a/cui/uiconfig/ui/applylocalizedpage.ui 
b/cui/uiconfig/ui/applylocalizedpage.ui
index 019f12b..a588c96 100644
--- a/cui/uiconfig/ui/applylocalizedpage.ui
+++ b/cui/uiconfig/ui/applylocalizedpage.ui
@@ -153,7 +153,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=startsingle
-property name=label translatable=yes ' 
/property
+property name=label ' /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
@@ -236,7 +236,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=endsingle
-property name=label translatable=yes ' 
/property
+property name=label ' /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
@@ -353,7 +353,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=startdouble
-property name=label translatable=yes  
/property
+property name=label  /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
@@ -436,7 +436,7 @@
 property name=column_spacing12/property
 child
   object class=GtkButton id=enddouble
-property name=label translatable=yes  
/property
+property name=label  /property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/Bootstrap

[Tor Lillqvist]

 android/Bootstrap/Makefile.shared |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 52bcb7e80a8e0f38fedd1a991fdcd4bce03d30da
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 16:25:45 2013 +0200

Fix path to lo-all-static-libs

Change-Id: I431841a71d6b4dc1f7a50efbf28f827e7e50ca57

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 74bec2d..ec5fa95 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -81,7 +81,7 @@ clean: android_version_setup properties
 
 LIBS = \
   -Wl,--start-group \
-  $(shell $(SRCDIR)/lo-all-static-libs) \
+  $(shell $(SRCDIR)/bin/lo-all-static-libs) \
   -Wl,--end-group
 
 WHOLELIBS = \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

[Kohei Yoshida]

 sc/qa/unit/data/xls/shared-formula-gap.xls |binary
 sc/qa/unit/filters-test.cxx|   34 -
 2 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 830a7f501b12c1c34753a656491050a252043974
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 09:29:35 2013 -0500

New test document to handle Excel's wrong shared formula range.

This is but just one example out of many out in the wild...

Change-Id: Ia542cff0e583bdcc397d0ee6ee3eaaa84f64fe4f

diff --git a/sc/qa/unit/data/xls/shared-formula-gap.xls 
b/sc/qa/unit/data/xls/shared-formula-gap.xls
new file mode 100644
index 000..762e393
Binary files /dev/null and b/sc/qa/unit/data/xls/shared-formula-gap.xls differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index d12ea60..bec9f76 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -349,8 +349,8 @@ void ScFiltersTest::testContentXLS_XML()
 void ScFiltersTest::testSharedFormulaXLS()
 {
 ScDocShellRef xDocSh = loadDoc(shared-formula., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
-CPPUNIT_ASSERT(pDoc);
 xDocSh-DoHardRecalc(true);
 // Check the results of formula cells in the shared formula range.
 for (SCROW i = 1; i = 18; ++i)
@@ -367,6 +367,38 @@ void ScFiltersTest::testSharedFormulaXLS()
 CPPUNIT_ASSERT_MESSAGE(Incorrect group geometry., 
xGroup-mpTopCell-aPos.Row() == 1  xGroup-mnLength == 18);
 
 xDocSh-DoClose();
+
+// The following file contains shared formula whose range is inaccurate.
+// Excel can easily mess up shared formula ranges, so we need to be able
+// to handle these wrong ranges that Excel stores.
+
+xDocSh = loadDoc(shared-formula-gap., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+pDoc = xDocSh-GetDocument();
+pDoc-CalcAll();
+
+if (!checkFormula(*pDoc, ScAddress(1,0,0), A1*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,1,0), A2*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,2,0), A3*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+// There is an intentional gap at row 4.
+
+if (!checkFormula(*pDoc, ScAddress(1,4,0), A5*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,5,0), A6*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,6,0), A7*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,7,0), A8*20))
+CPPUNIT_FAIL(Wrong formula.);
 }
 
 void ScFiltersTest::testSharedFormulaXLSX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/qa

[Kohei Yoshida]

 sc/qa/unit/data/xls/shared-formula-gap.xls |binary
 sc/qa/unit/filters-test.cxx|   34 -
 2 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit b55a751803209bc4eddb6d938417cdcbd05313fd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 09:29:35 2013 -0500

New test document to handle Excel's wrong shared formula range.

This is but just one example out of many out in the wild...

Change-Id: Ia542cff0e583bdcc397d0ee6ee3eaaa84f64fe4f
(cherry picked from commit 830a7f501b12c1c34753a656491050a252043974)

diff --git a/sc/qa/unit/data/xls/shared-formula-gap.xls 
b/sc/qa/unit/data/xls/shared-formula-gap.xls
new file mode 100644
index 000..762e393
Binary files /dev/null and b/sc/qa/unit/data/xls/shared-formula-gap.xls differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index d12ea60..bec9f76 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -349,8 +349,8 @@ void ScFiltersTest::testContentXLS_XML()
 void ScFiltersTest::testSharedFormulaXLS()
 {
 ScDocShellRef xDocSh = loadDoc(shared-formula., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
 ScDocument* pDoc = xDocSh-GetDocument();
-CPPUNIT_ASSERT(pDoc);
 xDocSh-DoHardRecalc(true);
 // Check the results of formula cells in the shared formula range.
 for (SCROW i = 1; i = 18; ++i)
@@ -367,6 +367,38 @@ void ScFiltersTest::testSharedFormulaXLS()
 CPPUNIT_ASSERT_MESSAGE(Incorrect group geometry., 
xGroup-mpTopCell-aPos.Row() == 1  xGroup-mnLength == 18);
 
 xDocSh-DoClose();
+
+// The following file contains shared formula whose range is inaccurate.
+// Excel can easily mess up shared formula ranges, so we need to be able
+// to handle these wrong ranges that Excel stores.
+
+xDocSh = loadDoc(shared-formula-gap., XLS);
+CPPUNIT_ASSERT(xDocSh.Is());
+pDoc = xDocSh-GetDocument();
+pDoc-CalcAll();
+
+if (!checkFormula(*pDoc, ScAddress(1,0,0), A1*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,1,0), A2*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,2,0), A3*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+// There is an intentional gap at row 4.
+
+if (!checkFormula(*pDoc, ScAddress(1,4,0), A5*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,5,0), A6*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,6,0), A7*20))
+CPPUNIT_FAIL(Wrong formula.);
+
+if (!checkFormula(*pDoc, ScAddress(1,7,0), A8*20))
+CPPUNIT_FAIL(Wrong formula.);
 }
 
 void ScFiltersTest::testSharedFormulaXLSX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/qa

[Kohei Yoshida]

 sc/qa/unit/filters-test.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b766f75acf734046a2befed29f6891b418caeaa0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 09:33:23 2013 -0500

Close the document when done.

Change-Id: Iad20ac5533a46a74642093c686e0941fb3bd29e3
(cherry picked from commit 68749283bc9da3c0422df0d22ad1d2f514d0250d)

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bec9f76..910d476 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -399,6 +399,8 @@ void ScFiltersTest::testSharedFormulaXLS()
 
 if (!checkFormula(*pDoc, ScAddress(1,7,0), A8*20))
 CPPUNIT_FAIL(Wrong formula.);
+
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testSharedFormulaXLSX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

[Kohei Yoshida]

 sc/qa/unit/filters-test.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 68749283bc9da3c0422df0d22ad1d2f514d0250d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 09:33:23 2013 -0500

Close the document when done.

Change-Id: Iad20ac5533a46a74642093c686e0941fb3bd29e3

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bec9f76..910d476 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -399,6 +399,8 @@ void ScFiltersTest::testSharedFormulaXLS()
 
 if (!checkFormula(*pDoc, ScAddress(1,7,0), A8*20))
 CPPUNIT_FAIL(Wrong formula.);
+
+xDocSh-DoClose();
 }
 
 void ScFiltersTest::testSharedFormulaXLSX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - scaddins/source

[Eike Rathke]

 scaddins/source/analysis/analysishelper.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 63153f10e0a7d16511878bbfcd97e2c8781a5564
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 15:44:02 2013 +0100

Revert Resolves: fdo#72174 convert_add from at or atm to Pa gives 
same answer

This reverts commit c2dd0ef4b891a3d126dbe70ab5b76016b69d491c.

OpenFormula defined CONVERT after Excel that treats at and atm as
equivalent. Let's not come up with different factors here, even if
academically these two units c/would be different things.

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 1b8fa1b..33c035f 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2547,7 +2547,7 @@ ConvertDataList::ConvertDataList( void )
 // PRESSURE: 1 Pascal is...
 NEWDP( Pa,1.E00,  CDC_Pressure ); // Pascal
 NEWDP( atm,   9.869232819300E-06, CDC_Pressure ); // Atmosphere
-NEWDP( at,1.0197162129779000E-05, CDC_Pressure ); // Atmosphere also
+NEWDP( at,9.869232819300E-06, CDC_Pressure ); // Atmosphere also
 NEWDP( mmHg,  7.5006170799862700E-03, CDC_Pressure ); // mm Hg (Mercury)
 NEWD( Torr,   7.50063800E-03, CDC_Pressure ); // *** Torr
 NEWD( psi,1.45037700E-04, CDC_Pressure ); // *** Psi
commit 98f6e171e5f0a27c91dd61a7bcab18157d364413
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 15:43:14 2013 +0100

Revert Let precise things and put some references

This reverts commit fccf6cfdee7b63feb6deb96e9c8cd398c20b44a3.

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 1528dac..1b8fa1b 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2546,8 +2546,8 @@ ConvertDataList::ConvertDataList( void )
 
 // PRESSURE: 1 Pascal is...
 NEWDP( Pa,1.E00,  CDC_Pressure ); // Pascal
-NEWDP( atm,   9.869232819300E-06, CDC_Pressure ); // Standard 
Atmosphere
-NEWDP( at,1.0197162129779000E-05, CDC_Pressure ); // Technical 
Atmosphere - http://physics.nist.gov/Pubs/SP811/appenB8.html
+NEWDP( atm,   9.869232819300E-06, CDC_Pressure ); // Atmosphere
+NEWDP( at,1.0197162129779000E-05, CDC_Pressure ); // Atmosphere also
 NEWDP( mmHg,  7.5006170799862700E-03, CDC_Pressure ); // mm Hg (Mercury)
 NEWD( Torr,   7.50063800E-03, CDC_Pressure ); // *** Torr
 NEWD( psi,1.45037700E-04, CDC_Pressure ); // *** Psi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - scaddins/source

[Eike Rathke]

 scaddins/source/analysis/analysishelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5491192f98a9b50e1b8d2ecd9d711ee373246d15
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 15:43:14 2013 +0100

Revert Resolves: fdo#72174 convert_add from at or atm to Pa gives 
same answer

This reverts commit 054b74222d72a61db3c67b32d62f99a1a0a5e9d6.

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 1b8fa1b..33c035f 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2547,7 +2547,7 @@ ConvertDataList::ConvertDataList( void )
 // PRESSURE: 1 Pascal is...
 NEWDP( Pa,1.E00,  CDC_Pressure ); // Pascal
 NEWDP( atm,   9.869232819300E-06, CDC_Pressure ); // Atmosphere
-NEWDP( at,1.0197162129779000E-05, CDC_Pressure ); // Atmosphere also
+NEWDP( at,9.869232819300E-06, CDC_Pressure ); // Atmosphere also
 NEWDP( mmHg,  7.5006170799862700E-03, CDC_Pressure ); // mm Hg (Mercury)
 NEWD( Torr,   7.50063800E-03, CDC_Pressure ); // *** Torr
 NEWD( psi,1.45037700E-04, CDC_Pressure ); // *** Psi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

[Kohei Yoshida]

 sc/qa/unit/filters-test.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 45f4cafa6ae59d8db6ffcf99563d57320d58d99d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 09:58:19 2013 -0500

Test our re-grouping of formula cells on load.

Change-Id: I038a3e5447244f8503502f344ade60dfb8e522f2

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 910d476..e7dcae2 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -400,6 +400,18 @@ void ScFiltersTest::testSharedFormulaXLS()
 if (!checkFormula(*pDoc, ScAddress(1,7,0), A8*20))
 CPPUNIT_FAIL(Wrong formula.);
 
+// We re-group formula cells on load. Let's check that as well.
+
+ScFormulaCell* pFC = pDoc-GetFormulaCell(ScAddress(1,0,0));
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch formula cell., pFC);
+CPPUNIT_ASSERT_MESSAGE(This should be the top cell in formula group., 
pFC-IsSharedTop());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(3), pFC-GetSharedLength());
+
+pFC = pDoc-GetFormulaCell(ScAddress(1,4,0));
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch formula cell., pFC);
+CPPUNIT_ASSERT_MESSAGE(This should be the top cell in formula group., 
pFC-IsSharedTop());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(4), pFC-GetSharedLength());
+
 xDocSh-DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scaddins/source

[Eike Rathke]

 scaddins/source/analysis/analysishelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 152ee33b6c70315e1103b12de745b3f9c675c0b2
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 15:57:50 2013 +0100

Revert Resolves: fdo#72174 convert_add from at or atm to Pa gives 
same answer

This reverts commit 4139dc70da04fe3d6a86bbab1e7bf6f11d812f04.

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index d5ff83b..d84dc39 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2541,7 +2541,7 @@ ConvertDataList::ConvertDataList( void )
 // PRESSURE: 1 Pascal is...
 NEWDP( Pa,1.E00,  CDC_Pressure ); // Pascal
 NEWDP( atm,   9.869232819300E-06, CDC_Pressure ); // Atmosphere
-NEWDP( at,1.0197162129779000E-05, CDC_Pressure ); // Atmosphere also
+NEWDP( at,9.869232819300E-06, CDC_Pressure ); // Atmosphere also
 NEWDP( mmHg,  7.5006170799862700E-03, CDC_Pressure ); // mm Hg (Mercury)
 NEWD( Torr,   7.50063800E-03, CDC_Pressure ); // *** Torr
 NEWD( psi,1.45037700E-04, CDC_Pressure ); // *** Psi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/qa

[Kohei Yoshida]

 sc/qa/unit/filters-test.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 959a610d5dc76383e46d5c5200c6126e1e60a50d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 09:58:19 2013 -0500

Test our re-grouping of formula cells on load.

Change-Id: I038a3e5447244f8503502f344ade60dfb8e522f2
(cherry picked from commit 45f4cafa6ae59d8db6ffcf99563d57320d58d99d)

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 910d476..e7dcae2 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -400,6 +400,18 @@ void ScFiltersTest::testSharedFormulaXLS()
 if (!checkFormula(*pDoc, ScAddress(1,7,0), A8*20))
 CPPUNIT_FAIL(Wrong formula.);
 
+// We re-group formula cells on load. Let's check that as well.
+
+ScFormulaCell* pFC = pDoc-GetFormulaCell(ScAddress(1,0,0));
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch formula cell., pFC);
+CPPUNIT_ASSERT_MESSAGE(This should be the top cell in formula group., 
pFC-IsSharedTop());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(3), pFC-GetSharedLength());
+
+pFC = pDoc-GetFormulaCell(ScAddress(1,4,0));
+CPPUNIT_ASSERT_MESSAGE(Failed to fetch formula cell., pFC);
+CPPUNIT_ASSERT_MESSAGE(This should be the top cell in formula group., 
pFC-IsSharedTop());
+CPPUNIT_ASSERT_EQUAL(static_castSCROW(4), pFC-GetSharedLength());
+
 xDocSh-DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-all-static-libs

[Tor Lillqvist]

 bin/lo-all-static-libs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f6a44a216ae79bc418946c50862346652b20c0b
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 17:44:25 2013 +0200

Fix path to libfreetype.a

Change-Id: I19061350996dbfc214e7bfe16be957c852187b0e

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index f6b726b..417edd9 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -38,7 +38,7 @@ androidlibs=
 if test $OS = ANDROID; then
 androidlibs=$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a
 androidlibs=$androidlibs 
$WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a
-androidlibs=$androidlibs 
$WORKDIR/UnpackedTarball/freetype/src/.libs/libfreetype.a
+androidlibs=$androidlibs 
$WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a
 fi
 
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] voting.git: configure.in vote/2013-board vote/index.wml vote/Makefile.am

[Thorsten Behrens]

 configure.in|1 
 vote/2013-board/Makefile.am |   14 +
 vote/2013-board/candidates.wml  |   78 +
 vote/2013-board/index.wml   |   59 +++
 vote/2013-board/mkical.py   |  253 
 vote/2013-board/rules.wml   |  114 ++
 vote/2013-board/timeline.ics|   72 +
 vote/2013-board/voting-instructions.txt |   40 +
 vote/Makefile.am|2 
 vote/index.wml  |1 
 10 files changed, 633 insertions(+), 1 deletion(-)

New commits:
commit 2517f21a67a1ad0967d5040b11a0a3d9ae347961
Author: Thorsten Behrens t...@documentfoundation.org
Date:   Thu Dec 5 16:46:51 2013 +0100

Create 2013 board election pages.

diff --git a/configure.in b/configure.in
index e285942..5567fea 100644
--- a/configure.in
+++ b/configure.in
@@ -19,4 +19,5 @@ vote/2011/Makefile
 vote/2012-confpoll/Makefile
 vote/2012-mc/Makefile
 vote/2013-confpoll/Makefile
+vote/2013-board/Makefile
 ])
diff --git a/vote/2013-board/Makefile.am b/vote/2013-board/Makefile.am
new file mode 100644
index 000..ebb124a
--- /dev/null
+++ b/vote/2013-board/Makefile.am
@@ -0,0 +1,14 @@
+SUBDIRS =
+
+urlpath = /vote/2013-board
+ 
+page_SCRIPTS = \
+   index.html \
+   candidates.html\
+   rules.html 
+
+page_DATA = \
+   timeline.ics
+   mkical.py
+
+include $(top_srcdir)/rules.common
diff --git a/vote/2013-board/candidates.wml b/vote/2013-board/candidates.wml
new file mode 100644
index 000..f8650f0
--- /dev/null
+++ b/vote/2013-board/candidates.wml
@@ -0,0 +1,78 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
+html
+
+  head
+titleThe Document Foundation 2013 Board of Directors Election 
Candidates/title
+meta http-equiv=Content-Type content=text/html; charset=UTF-8/
+  /head
+
+  body
+h1Candidates for The Document Foundation 2013 Board of Directors 
Election/h1
+
+p
+  Below you will find a list of candidates who are running for the
+  The Document Foundation Board of Directors. A short summary statement 
from
+  each candidate and a link to their full candidacy announcement is
+  provided to help you learn more about them. We encourage all voters
+  to read the full candidacy statements and related discussions on
+  a 
href=http://listarchives.documentfoundation.org/www/discuss/;discuss#64;documentfoundation#46;org/a.
+/p
+
+p When deciding who you should vote for, please carefully
+consider the various tasks the Board of Directors must
+perform. This a href=../overview.htmloverview/a may be
+helpful. Keep in mind that the board will make a number of
+important decisions and will also have to perform many tasks which
+might require a significant amount of time and effort and the
+ability to work and communicate with other people, companies, and
+the media. It is a good idea to strive for a well-balanced board
+consisting of people with various backgrounds, skills, and
+perspectives.  /p
+
+p
+  Additional elections details can be found in the
+  a href=http://wiki.documentfoundation.org/CommunityBylaws;Document 
Foundation Bylaws/a.
+/p
+
+p
+  If you have any questions, please send them to either
+  a 
href=http://listarchives.documentfoundation.org/www/discuss/;discuss#64;documentfoundation#46;org/a
+  or to us at a
+  
href=mailto:elections#64;documentfoundation#46;org;elections#64;documentfoundation#46;org/a.
+/p
+
+h2Candidates for The Document Foundation Board of Directors/h2
+
+ol
+listrongJoe Random Candidate/strongbr /
+   Affiliation: emACME/embr /
+   Full statement at a 
href=http://www.mail-archive.com/discuss@documentfoundation.org/;http://www.mail-archive.com/discuss@documentfoundation.org//a
+   blockquote
+ Some 75 words of wisdom.
+   /blockquote
+!-- Verified Member --
+/li
+/ol
+
+h2Additional Elections-related Information/h2
+
+p
+  Note, that according to the a
+  
href=http://wiki.documentfoundation.org/CommunityBylaws#Provisions_Concerning_Possible_Conflicts_of_Interest;Bylaws/a,
+  there is a 3-person maximum on the number of people affiliated
+  with any one company that can be on the board and the deputies:
+  if more than 3 persons from one company get elected, only the
+  top 3 vote getters will get on.  You will be able to vote for up
+  to 10 candidates of your choice, with no restrictions, except
+  that you cannot vote more than once for the same candidate.
+/p
+
+p
+  If you have any futher question, please consult the
+  a href=rules.htmlRules for this election/a or write to
+  a 

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

[Caolán McNamara]

 include/svx/fmresids.hrc  |2 
 svx/UIConfig_svx.mk   |1 
 svx/inc/fmhelp.hrc|1 
 svx/source/form/datanavi.cxx  |   36 ++-
 svx/source/form/datanavi.src  |   66 -
 svx/source/inc/datanavi.hrc   |6 -
 svx/source/inc/datanavi.hxx   |   32 ++
 svx/uiconfig/ui/addnamespacedialog.ui |  167 ++
 8 files changed, 191 insertions(+), 120 deletions(-)

New commits:
commit 2b04cfa242436b2227600224450eb6fd75a2db1a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 14:47:17 2013 +

convert add namespace dialog to .ui

Change-Id: I3636da91d39b2759dca72f30cc7b086b6f9cbb16

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index f6281e1..2b17bbd 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -64,7 +64,7 @@
 #define RID_SVXDLG_ADD_DATAITEM (RID_FORMS_START + 12)
 #define RID_SVXDLG_ADD_CONDITION(RID_FORMS_START + 13)
 #define RID_SVXDLG_NAMESPACE_ITEM   (RID_FORMS_START + 14)
-#define RID_SVXDLG_MANAGE_NAMESPACE (RID_FORMS_START + 15)
+
 #define RID_SVXDLG_ADD_SUBMISSION   (RID_FORMS_START + 16)
 #define RID_SVXDLG_ADD_MODEL(RID_FORMS_START + 17)
 #define RID_SVXDLG_ADD_INSTANCE (RID_FORMS_START + 18)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 7662784..2cd3889 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/acceptrejectchangesdialog \
+   svx/uiconfig/ui/addnamespacedialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 17f663a..4a95afb 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -57,7 +57,6 @@
 #define HID_XFORMS_ADDCONDITION_DLG   
SVX_HID_XFORMS_ADDCONDITION_DLG
 #define HID_XFORMS_NAMESPACEITEM_DLG  
SVX_HID_XFORMS_NAMESPACEITEM_DLG
 #define HID_XFORMS_NAMESPACEITEM_LIST 
SVX_HID_XFORMS_NAMESPACEITEM_LIST
-#define HID_XFORMS_MANAGENAMESPACE_DLG
SVX_HID_XFORMS_MANAGENAMESPACE_DLG
 #define HID_MN_XFORMS_MODELS_ADD  
SVX_HID_MN_XFORMS_MODELS_ADD
 #define HID_MN_XFORMS_MODELS_EDIT 
SVX_HID_MN_XFORMS_MODELS_EDIT
 #define HID_MN_XFORMS_MODELS_REMOVE   
SVX_HID_MN_XFORMS_MODELS_REMOVE
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 58f74cbb..bd2e530 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3300,40 +3300,24 @@ namespace svxform
 // class ManageNamespaceDialog
 //
 
-ManageNamespaceDialog::ManageNamespaceDialog(
-Window* pParent, AddConditionDialog* _pCondDlg, bool _bIsEdit ) :
-
-ModalDialog( pParent, SVX_RES( RID_SVXDLG_MANAGE_NAMESPACE ) ),
-
-m_aPrefixFT ( this, SVX_RES( FT_PREFIX ) ),
-m_aPrefixED ( this, SVX_RES( ED_PREFIX ) ),
-m_aUrlFT( this, SVX_RES( FT_URL ) ),
-m_aUrlED( this, SVX_RES( ED_URL ) ),
-m_aButtonsFL( this, SVX_RES( FL_DATANAV_BTN ) ),
-m_aOKBtn( this, SVX_RES( BTN_DATANAV_OK ) ),
-m_aEscBtn   ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-m_aHelpBtn  ( this, SVX_RES( BTN_DATANAV_HELP ) ),
-
-m_pConditionDlg ( _pCondDlg )
-
+ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, 
AddConditionDialog* _pCondDlg, bool bIsEdit)
+: ModalDialog(pParent, AddNamespaceDialog, 
svx/ui/addnamespacedialog.ui)
+, m_pConditionDlg ( _pCondDlg )
 {
-if ( _bIsEdit )
-SetText(SVX_RESSTR(STR_EDIT_TEXT));
+get(m_pOKBtn, ok);
+get(m_pPrefixED, prefix);
+get(m_pUrlED, url);
 
-FreeResource();
+if (bIsEdit)
+SetText(getFixedText(alttitle)-GetText());
 
-m_aOKBtn.SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
-}
-
-//
-ManageNamespaceDialog::~ManageNamespaceDialog()
-{
+m_pOKBtn-SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
 }
 
 //
 IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl)
 {
-OUString sPrefix = m_aPrefixED.GetText();
+OUString sPrefix = m_pPrefixED-GetText();
 
 try
 {
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ad141be95c9e8d60c874b013464ab057ab93d71
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:07:07 2013 +

Updated core
Project: help  c89e8d5cf5a63a7efaa9cde1903abf985963dacb

diff --git a/helpcontent2 b/helpcontent2
index a06c9b3..c89e8d5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a06c9b3125bb3329c6bf0209aee7b7f93f25136c
+Subproject commit c89e8d5cf5a63a7efaa9cde1903abf985963dacb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst

[Caolán McNamara]

 helpers/help_hid.lst |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit c89e8d5cf5a63a7efaa9cde1903abf985963dacb
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:07:07 2013 +

drop unused helpids

Change-Id: Ice375a144d90771fb2376773aae36a8bc0e47bde

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 971c18d..45ce17a 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3716,7 +3716,6 @@ HID_XFORMS_ADDMODEL_DLG,38134,
 HID_XFORMS_ADDSUBMISSION_DLG,38133,
 HID_XFORMS_INSTANCES_MENUBTN,38132,
 HID_XFORMS_ITEMS_LIST,38129,
-HID_XFORMS_MANAGENAMESPACE_DLG,38112,
 HID_XFORMS_MODELS_LIST,38130,
 HID_XFORMS_MODELS_MENUBTN,38131,
 HID_XFORMS_NAMESPACEITEM_DLG,38110,
@@ -6582,8 +6581,6 @@ 
svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034,
 svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965,
 svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497,
-svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_PREFIX,1368901643,
-svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_URL,1368901645,
 svx_Edit_RID_SVXDLG_PASSWORD_ED_NEW_PASSWD,1239894037,
 svx_Edit_RID_SVXDLG_PASSWORD_ED_OLD_PASSWD,1239894027,
 svx_Edit_RID_SVXDLG_PASSWORD_ED_REPEAT_PASSWD,1239894039,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Andrzej J . R . Hunt]

 vcl/source/gdi/gdimtf.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 2f641a7d37fd7fb80286be5a37778c41ac834d93
Author: Andrzej J.R. Hunt andrzej.h...@collabora.com
Date:   Thu Dec 5 11:36:53 2013 +

EMF+: force canvas if EMF+ comments are used.

Without this the drawinglayer renderer is used, whereas
only the canvas renderer supports EMF+.

Change-Id: Id8a10e400e08c1913e7d6864a51f7b73fc9be437
(cherry picked from commit be7d87bea2611eb316b9b379aebc031179d4f794)
Reviewed-on: https://gerrit.libreoffice.org/6940
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index f5666a6..1240500 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2765,6 +2765,13 @@ SvStream operator( SvStream rIStm, GDIMetaFile 
rGDIMetaFile )
 {
 pAction = MetaAction::ReadMetaAction( rIStm, aReadData );
 
+if (pAction-GetType() == META_COMMENT_ACTION)
+{
+MetaCommentAction* pCommentAct = 
static_castMetaCommentAction*(pAction);
+if ( pCommentAct-GetComment() == EMF_PLUS )
+rGDIMetaFile.UseCanvas( sal_True );
+}
+
 if( pAction )
 rGDIMetaFile.AddAction( pAction );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sw/source winaccessibility/source

[Tor Lillqvist]

 sc/source/ui/Accessibility/AccessibleCell.cxx   |4 ++--
 sw/source/core/access/acccell.cxx   |5 +++--
 winaccessibility/source/UAccCOM/AccTextBase.cxx |8 
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit a0a903892ca93615c1460cebbfbac57233f2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 18:06:04 2013 +0200

Avoid multiple definitions of two lovingly copy-pasted functions

Multple external definitions of a symbol causes problems when linking
statically, as for Android. Just make the functions static for now, as they
are only used locally in the files where defined anyway.

Change-Id: I8ddbaf01497c171bed4e15f6183ba43461c672d1

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx 
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index efd178b..74c9d72 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -470,7 +470,7 @@ void ScAccessibleCell::AddRelation(const ScRange rRange,
 }
 }
 
-OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString 
replaceStr)
+static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, 
OUString replaceStr)
 {
 int iReplace = -1;
 iReplace = oldOUString.lastIndexOf(replacedChar);
@@ -485,7 +485,7 @@ OUString ReplaceOneChar(OUString oldOUString, OUString 
replacedChar, OUString re
 return oldOUString;
 }
 
-OUString ReplaceFourChar(OUString oldOUString)
+static OUString ReplaceFourChar(OUString oldOUString)
 {
 oldOUString = ReplaceOneChar(oldOUString, \\, );
 oldOUString = ReplaceOneChar(oldOUString, ;, \\;);
diff --git a/sw/source/core/access/acccell.cxx 
b/sw/source/core/access/acccell.cxx
index 97e1460..137fa4c 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -399,7 +399,7 @@ uno::Any SwAccessibleCell::getMinimumValue(  )
 return aAny;
 }
 
-OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString 
replaceStr)
+static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, 
OUString replaceStr)
 {
 int iReplace = -1;
 iReplace = oldOUString.lastIndexOf(replacedChar);
@@ -413,7 +413,8 @@ OUString ReplaceOneChar(OUString oldOUString, OUString 
replacedChar, OUString re
 }
 return oldOUString;
 }
-OUString ReplaceFourChar(OUString oldOUString)
+
+static OUString ReplaceFourChar(OUString oldOUString)
 {
 oldOUString = ReplaceOneChar(oldOUString,OUString(\\),OUString());
 oldOUString = ReplaceOneChar(oldOUString,OUString(;),OUString(\\;));
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx 
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index e63afe4..756bce9 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -39,7 +39,7 @@ using namespace rtl;
 // Construction/Destruction
 //
 
-OUString ReplaceFourChar(OUString oldOUString);
+static OUString ReplaceFourChar(OUString oldOUString);
 
 CAccTextBase::CAccTextBase()
 {}
@@ -962,7 +962,7 @@ STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface)
 LEAVE_PROTECTED_BLOCK
 }
 
-OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString 
replaceStr)
+static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, 
OUString replaceStr)
 {
 int iReplace = -1;
 iReplace = oldOUString.lastIndexOf(replacedChar);
@@ -975,9 +975,9 @@ OUString ReplaceOneChar(OUString oldOUString, OUString 
replacedChar, OUString re
 }
 }
 return oldOUString;
-
 }
-OUString ReplaceFourChar(OUString oldOUString)
+
+static OUString ReplaceFourChar(OUString oldOUString)
 {
 oldOUString = ReplaceOneChar(oldOUString, OUString(\\), 
OUString());
 oldOUString = ReplaceOneChar(oldOUString, OUString(;), OUString(\\;));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara]

 svtools/source/contnr/treelist.cxx|6 --
 svtools/source/contnr/treelistbox.cxx |4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 0c3211b1f20383b4fbee8978e88c21e498e35047
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:25:16 2013 +

crash on exit from xml form document with accessibility enabled

Change-Id: If60075b939569cf339f7ccf7e39e513fbe1f74bf

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 8500425..4cac34b 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1472,7 +1472,8 @@ sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry 
) const
 {
 DBG_ASSERT(pEntry,IsExpanded:No Entry);
 SvDataTable::const_iterator itr = maDataTable.find(pEntry );
-DBG_ASSERT(itr != maDataTable.end(),Entry not in Table);
+if (itr == maDataTable.end())
+return false;
 return itr-second-IsSelected();
 }
 
@@ -1487,7 +1488,8 @@ void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, 
sal_Bool bFocus )
 const SvViewDataEntry* SvListView::GetViewData( const SvTreeListEntry* pEntry 
) const
 {
 SvDataTable::const_iterator itr = maDataTable.find( 
const_castSvTreeListEntry*(pEntry) );
-DBG_ASSERT(itr != maDataTable.end(),Entry not in model or wrong view);
+if (itr == maDataTable.end())
+return NULL;
 return itr-second;
 }
 
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 661e109..1602cd3 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -4081,8 +4081,8 @@ void SvTreeListBox::FillAccessibleEntryStateSet( 
SvTreeListEntry* pEntry, ::utl:
 SvViewDataEntry* pViewDataNewCur = 0;
 if( pEntry )
 {
-pViewDataNewCur= GetViewDataEntry(pEntry);
-if(pViewDataNewCur-HasFocus())
+pViewDataNewCur = GetViewDataEntry(pEntry);
+if (pViewDataNewCur  pViewDataNewCur-HasFocus())
 rStateSet.AddState( AccessibleStateType::FOCUSED );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svtools/source

[Caolán McNamara]

 svtools/source/contnr/treelist.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2140ea5569588155702580eefef2c168d5c701d8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:25:16 2013 +

crash on exit from xml form document with accessibility enabled

(cherry picked from commit 0c3211b1f20383b4fbee8978e88c21e498e35047)

Conflicts:
svtools/source/contnr/treelistbox.cxx

Change-Id: If60075b939569cf339f7ccf7e39e513fbe1f74bf

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 8500425..4cac34b 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1472,7 +1472,8 @@ sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry 
) const
 {
 DBG_ASSERT(pEntry,IsExpanded:No Entry);
 SvDataTable::const_iterator itr = maDataTable.find(pEntry );
-DBG_ASSERT(itr != maDataTable.end(),Entry not in Table);
+if (itr == maDataTable.end())
+return false;
 return itr-second-IsSelected();
 }
 
@@ -1487,7 +1488,8 @@ void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, 
sal_Bool bFocus )
 const SvViewDataEntry* SvListView::GetViewData( const SvTreeListEntry* pEntry 
) const
 {
 SvDataTable::const_iterator itr = maDataTable.find( 
const_castSvTreeListEntry*(pEntry) );
-DBG_ASSERT(itr != maDataTable.end(),Entry not in model or wrong view);
+if (itr == maDataTable.end())
+return NULL;
 return itr-second;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

[Caolán McNamara]

 include/svx/fmresids.hrc  |2 
 svx/UIConfig_svx.mk   |1 
 svx/inc/fmhelp.hrc|1 
 svx/source/form/datanavi.cxx  |   26 +
 svx/source/form/datanavi.src  |   69 --
 svx/source/inc/datanavi.hxx   |   19 +---
 svx/uiconfig/ui/addmodeldialog.ui |  178 ++
 7 files changed, 192 insertions(+), 104 deletions(-)

New commits:
commit e5d35be267c4f4c7dd745fc8864df805e6675126
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:45:46 2013 +

convert add model dialog to .ui

Change-Id: I20d10d0e9c311bcfb1386d481ae4832f463b931a

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 2b17bbd..fdeed41 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -66,7 +66,7 @@
 #define RID_SVXDLG_NAMESPACE_ITEM   (RID_FORMS_START + 14)
 
 #define RID_SVXDLG_ADD_SUBMISSION   (RID_FORMS_START + 16)
-#define RID_SVXDLG_ADD_MODEL(RID_FORMS_START + 17)
+
 #define RID_SVXDLG_ADD_INSTANCE (RID_FORMS_START + 18)
 #define RID_SVXWIN_DATANAVIGATOR(RID_FORMS_START + 19)
 #define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 2cd3889..a031a2d 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/acceptrejectchangesdialog \
+   svx/uiconfig/ui/addmodeldialog \
svx/uiconfig/ui/addnamespacedialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 4a95afb..4245769 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -75,7 +75,6 @@
 #define HID_XFORMS_MODELS_MENUBTN 
SVX_HID_XFORMS_MODELS_MENUBTN
 #define HID_XFORMS_INSTANCES_MENUBTN  
SVX_HID_XFORMS_INSTANCES_MENUBTN
 #define HID_XFORMS_ADDSUBMISSION_DLG  
SVX_HID_XFORMS_ADDSUBMISSION_DLG
-#define HID_XFORMS_ADDMODEL_DLG   
SVX_HID_XFORMS_ADDMODEL_DLG
 #define HID_XFORMS_ADDINSTANCE_DLG
SVX_HID_XFORMS_ADDINSTANCE_DLG
 #define HID_XFORMS_MID_INSERT_CONTROL 
SVX_HID_XFORMS_MID_INSERT_CONTROL
 #define HID_XFORMS_TAB_CONTROL
SVX_HID_XFORMS_TAB_CONTROL
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index bd2e530..9820a0b 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3583,28 +3583,14 @@ namespace svxform
 // class AddModelDialog
 //
 
-AddModelDialog::AddModelDialog( Window* pParent, bool _bEdit ) :
-
-ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_MODEL ) ),
-
-m_aModelFL  ( this, SVX_RES( FL_MODEL ) ),
-m_aNameFT   ( this, SVX_RES( FT_MODEL_NAME ) ),
-m_aNameED   ( this, SVX_RES( ED_MODEL_NAME ) ),
-m_aModifyCB ( this, SVX_RES( CB_MODIFIES_DOCUMENT ) ),
-m_aButtonsFL( this, SVX_RES( FL_DATANAV_BTN ) ),
-m_aOKBtn( this, SVX_RES( BTN_DATANAV_OK ) ),
-m_aEscBtn   ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-m_aHelpBtn  ( this, SVX_RES( BTN_DATANAV_HELP ) )
-
+AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit)
+: ModalDialog(pParent, AddModelDialog, svx/ui/addmodeldialog.ui)
 {
-if ( _bEdit )
-SetText(SVX_RESSTR(STR_EDIT_TEXT));
-
-FreeResource();
-}
+get(m_pNameED, name);
+get(m_pModifyCB, modify);
 
-AddModelDialog::~AddModelDialog()
-{
+if (bIsEdit)
+SetText(getFixedText(alttitle)-GetText());
 }
 
 //
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 974924d..882b93a 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -868,75 +868,6 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
 };
 };
 
-ModalDialog RID_SVXDLG_ADD_MODEL
-{
-HelpID = HID_XFORMS_ADDMODEL_DLG ;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 180 , 82 ) ;
-Text [ en-US ] = Add Model ;
-Moveable = TRUE ;
-FixedLine FL_INSTANCE
-{
-Pos = MAP_APPFONT ( 4 , 3 ) ;
-Size = MAP_APPFONT ( 172 , 8 ) ;
-Text [ en-US ] = Model ;
-};
-FixedText FT_INST_NAME
-{
-Pos = MAP_APPFONT ( 6 , 14 ) ;
-Size = MAP_APPFONT ( 51 , 12 ) ;
-LeftLabel = TRUE ;
-VCenter = TRUE;
-Text [ en-US ] = ~Name ;
-};
-Edit ED_INST_NAME
-{
-HelpID = 

[Libreoffice-commits] core.git: starmath/source

[Andras Timar]

 starmath/source/commands.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bcbcdbbea1f9ade878f427371a251acf84aaf369
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Dec 5 18:08:07 2013 +0100

typo: Align Right - Align Left

Change-Id: I8a347394bff7767a8d2b1b548ea9d9b8848bb1ae

diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index cf52574..b66b97e 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -389,7 +389,7 @@ String RID_STACK_HELP   { Text = Vertical Stack ; };
 String RID_MATRIX   { Text = matrix{? # ? ## ? # ?}  ; };
 String RID_MATRIX_HELP  { Text = Matrix Stack ; };
 String RID_ALIGNLX  { Text = alignl ?  ; };
-String RID_ALIGNLX_HELP { Text = Align Right ; };
+String RID_ALIGNLX_HELP { Text = Align Left ; };
 String RID_ALIGNCX  { Text = alignc ?  ; };
 String RID_ALIGNCX_HELP { Text = Align Center ; };
 String RID_ALIGNRX  { Text = alignr ?  ; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |3 ---
 source/text/shared/01/xformsdata.xhp |6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit f8c4192ba2f4e80a59899cd6e48e05317eaec71b
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:59:12 2013 +

update helpids for add model dialog .ui conversion

Change-Id: Id33d6208a2b67a2ce6f3757d54fff55532696147

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 45ce17a..13a5167 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3712,7 +3712,6 @@ HID_WIZARD_PREVIOUS,33023,
 HID_XFORMS_ADDCONDITION_DLG,38109,
 HID_XFORMS_ADDDATAITEM_DLG,38108,
 HID_XFORMS_ADDINSTANCE_DLG,38135,
-HID_XFORMS_ADDMODEL_DLG,38134,
 HID_XFORMS_ADDSUBMISSION_DLG,38133,
 HID_XFORMS_INSTANCES_MENUBTN,38132,
 HID_XFORMS_ITEMS_LIST,38129,
@@ -6510,7 +6509,6 @@ 
svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY,1368851481,
 svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_RELEVANT,1368851477,
 svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_REQUIRED,1368851475,
 svx_CheckBox_RID_SVXDLG_ADD_INSTANCE_CB_INST_LINKINST,1368949776,
-svx_CheckBox_RID_SVXDLG_ADD_MODEL_CB_MODIFIES_DOCUMENT,1368933377,
 svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194,
 svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_2,3391947780,
 svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_3,3391947779,
@@ -6575,7 +6573,6 @@ svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246,
 svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494,
 svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492,
 svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796,
-svx_Edit_RID_SVXDLG_ADD_MODEL_ED_INST_NAME,1368934412,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_ACTION,1368918030,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028,
 svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034,
diff --git a/source/text/shared/01/xformsdata.xhp 
b/source/text/shared/01/xformsdata.xhp
index 0724697..95d392d 100644
--- a/source/text/shared/01/xformsdata.xhp
+++ b/source/text/shared/01/xformsdata.xhp
@@ -50,9 +50,9 @@
 bookmark xml-lang=en-US branch=hid/SVX_HID_MN_XFORMS_MODELS_ADD 
id=bm_id6934415 localize=false/
 paragraph xml-lang=en-US id=par_idN10604 role=heading level=3 
l10n=NEWAdd/paragraph
   paragraph xml-lang=en-US id=par_idN10608 role=paragraph 
l10n=CHGahelp hid=.Opens the Add Model dialog where you can add an XForm 
model./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME 
id=bm_id0130200901582112 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/addmodeldialog/name 
id=bm_id0130200901582112 localize=false/
 paragraph xml-lang=en-US id=par_id0130200901590878 role=paragraph 
l10n=NEWahelp hid=. visibility=hiddenEnter the 
name./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT 
id=bm_id0910200811130823 localize=false/
+bookmark xml-lang=en-US branch=hid/svx/ui/addmodeldialog/modify 
id=bm_id0910200811130823 localize=false/
 paragraph xml-lang=en-US id=hd_id0910200811173295 role=heading 
level=3 l10n=NEWModel data updates change document's modification 
status/paragraph
   paragraph xml-lang=en-US id=par_id0910200811173255 role=paragraph 
l10n=NEWahelp hid=.When enabled, the document status will be set to 
modified when you change any form control that is bound to any data in the 
model. When not enabled, such a change does not set the document status to 
modified./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/SVX_HID_MN_XFORMS_MODELS_REMOVE 
id=bm_id5671559 localize=false/
@@ -98,4 +98,4 @@
 paragraph xml-lang=en-US id=par_idN1062B role=heading level=3 
l10n=CHGDelete/paragraph
   paragraph xml-lang=en-US id=par_idN1062F role=paragraph 
l10n=CHGahelp hid=.Deletes the selected item (element, attribute, 
submission, or binding)./ahelp/paragraph
/body
-/helpdocument
\ No newline at end of file
+/helpdocument
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b780e0c263edf7124d261a616a5daed723cc2cf6
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:59:12 2013 +

Updated core
Project: help  f8c4192ba2f4e80a59899cd6e48e05317eaec71b

diff --git a/helpcontent2 b/helpcontent2
index c89e8d5..f8c4192 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c89e8d5cf5a63a7efaa9cde1903abf985963dacb
+Subproject commit f8c4192ba2f4e80a59899cd6e48e05317eaec71b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source

[Andras Timar]

 starmath/source/commands.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b4da3c26521b5b20a792c1913ee26ff846d166f0
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Dec 5 18:08:07 2013 +0100

typo: Align Right - Align Left

Change-Id: I8a347394bff7767a8d2b1b548ea9d9b8848bb1ae

diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index cf52574..b66b97e 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -389,7 +389,7 @@ String RID_STACK_HELP   { Text = Vertical Stack ; };
 String RID_MATRIX   { Text = matrix{? # ? ## ? # ?}  ; };
 String RID_MATRIX_HELP  { Text = Matrix Stack ; };
 String RID_ALIGNLX  { Text = alignl ?  ; };
-String RID_ALIGNLX_HELP { Text = Align Right ; };
+String RID_ALIGNLX_HELP { Text = Align Left ; };
 String RID_ALIGNCX  { Text = alignc ?  ; };
 String RID_ALIGNCX_HELP { Text = Align Center ; };
 String RID_ALIGNRX  { Text = alignr ?  ; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present
+ Adam, Kohei, Markus, Lionel, Thorsten, Eike, Miklos, Michael, David, 
Caolan, Kendy,
  Michael S, Christian, Norbert, Andras, Stephan,  Bjoern, Robinson, 
Eilidh, Ahmad

* Completed Action Items
+ mail Charles wrt. website / code-finding concerns: want a cgit link 
nearby (Tibby)
see also: https://bugs.freedesktop.org/show_bug.cgi?id=71683
+ help Robinson wrt. getting MS Office (Michael)
+ merge data-streams as experimental to libreoffice-4-2 (Matus)
+ rubber stamp Tamaz' patch in gerrit (Bjoern + Thorsten)
+ Make a video about the IDE awesomeness (Bjoern)
[ 
http://skyfromme.wordpress.com/2013/12/04/libreoffice-ide-integration/ ]
+ merge experimental XLSX work to libreoffice-4-2 (Kohei/Michael)
[ done - brought in a big, but harmless FastParser re-work too ]
+ get some doc pointers on how to use Accerciser etc. (Jacobo)
[ WIP here:
https://wiki.documentfoundation.org/Development/Accessibility ]
+ Accessibility bugs (Jacobo)
   [ filed new start center issue:
  https://bugs.freedesktop.org/show_bug.cgi?id=72342
  adding whiteboard 'a11y' to bugs ]
+ attach a callgrind profile for 'expert config' to bug (Kendy)
   [ could make it experimental later if necessary ]
   https://bugs.freedesktop.org/show_bug.cgi?id=72125
+ update start-center strings / tweak before UI freeze (Kendy)
   [ strings done ]

* Pending Action Items:
+ actually produce callgrind performance metrics from VM (Matus)
+ partition document test loads / run them on tinderboxen (Norbert)
[ still ongoing work ]
+ blog about the death of the solver (Michael S)
+ need design for copying styles between templates (Cor Nouws/other UX?)
cf. 
http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html

http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html
+ decide on whether to remove legacy Java Access Bridge from 4.2 (Michael S)

* Improved agenda-ising (Michael)
+ will post an agenda and dump in the etherpad for people
  to extend / tweak as they like.
+ saves a chunk of E-mailing.
+ like to have an off-line view (Miklos)
= will E-mail and dump in etherpad concurrently.

* Release Engineering update (Christian)
+ 4.2 Beta2 pre-announced
+ synching to mirrors, can be announced later today.
+ 4.1.4 RC2
+ deadline on Monday - Dec 16th
+ Then a Christmas break of 2x weeks in the schedule ...
+ 4.2 - next deadline Jan 6th.
+ GSOC / Android  iOS remote control releases for 4.2 ...
+ Android pieces are all good, translation snafu with gettext conversion
+ fixed manually - just one string.
+ re: iOS - all the UI needs to add a new translation manually in XCode
+ pretty horrible, so far only Chinese  French, others can be added
  when the translation is complete.
+ 4.2 Feature freeze update / status
+ Data Streams - Experimental  de-freeze ... ?
[ merged ]
+ XLSX threaded loading
[ merged ]
+ expert config page - still ~infinitely slow needs fixing
[ pending - turn 'experimental' by RC2 if not fixed.
  Administrators want to turn it off entirely somehow (Cloph)
  Can we make it experimental and disable it by default (Thorsten)
  Spent some time on the perf. during gsoc but no sol'n ]
+ sifr icons (Ahmad)
[ done with most of them; one remaining icon on drawing toolbar 
waiting
  to be finished. New icons from the new sidebar done by Pavel.
  Hard deadline Dec 16th.
AI:   cherry-pick icon fixes to libreoffice-4-2 branch (Abdulmajid) ]
+ 4.2 MAB count - still v. high for this point in the cycle.
+ please ensure that release notes are up-to-date:
+ https://wiki.documentfoundation.org/ReleaseNotes/4.2

* Symbols for Windows releases (Markus)
+ makes sense to provide and/or build with symbols on windows
+ provide symbols on the TDF server, so QA team can provide backtraces for 
crashes
+ becomes more important with the OpenCL changes
+ some openCL compilers start to crash sometimes: need to identify them.
+ Kendy's tinderbox is now providing the symbols (Kendy)
+ http://dev-builds.libreoffice.org/daily/master/Win-x86@39/symbols/
+ We need it for release builds (Markus)
+ only just enabled Lubos' script - don't know if it works (Kendy)
+ along those lines - repeated QA requests re: missing builds (Thorsten)
+ happy to change the config to anything - if we agree on it.
+ can QA dictate a desirable setup for Windows / tinderboxen ?
 + by default a release config (?)
+ still problems with tinderbox - hanging with OpenCL sometimes (Markus)
+ can we have 

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/mce-nested.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   10 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 31c65a129afb3c1bf14a1acd88c60b64d4f555d1
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 5 18:20:51 2013 +0100

DOCX import: never call lcl_start/endElement if handling mce elements

The problem was that after handling the mce elements
(AlternativeContent, Choice, Fallback) we still invoked the lcl version
of these methods and this resulted in duplicated properties in the
dmapper, finally resulting in incorrect position of the textbox.

Change-Id: Ib581162cba703fc1e2e44c1a9e63358891d6f78c

diff --git a/sw/qa/extras/ooxmlimport/data/mce-nested.docx 
b/sw/qa/extras/ooxmlimport/data/mce-nested.docx
new file mode 100644
index 000..c110f63
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/mce-nested.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bd7b180..d7ce137 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1583,6 +1583,16 @@ DECLARE_OOXMLIMPORT_TEST(testMceWpg, mce-wpg.docx)
 getParagraphOfText(1, xText, DML1);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testMceNested, mce-nested.docx)
+{
+// Vertical position of the textbox was incorrect due to incorrect nested 
mce handling.
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), 
uno::UNO_QUERY);
+// positionV's posOffset from the bugdoc, was 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(2514600)), 
getPropertysal_Int32(xFrame, VertOrientPosition));
+}
+
 DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
 {
 // The document contains a rotated bitmap
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index ed1ae17..a50f449 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -242,7 +242,7 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement
 if (oox::getNamespace(Element) == static_castsal_Int32(NS_mce))
 m_bDiscardChildren = prepareMceContext(Element, Attribs);
 
-if (!m_bDiscardChildren)
+else if (!m_bDiscardChildren)
 {
 attributes(Attribs);
 lcl_startFastElement(Element, Attribs);
@@ -283,7 +283,7 @@ throw (uno::RuntimeException, xml::sax::SAXException)
 m_bTookChoice = aState.m_bTookChoice;
 }
 
-if (!m_bDiscardChildren)
+else if (!m_bDiscardChildren)
 lcl_endFastElement(Element);
 
 #ifdef DEBUG_CONTEXT_HANDLER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - basctl/source connectivity/source cui/source dbaccess/source extensions/source filter/source include/comphelper include/connectivity include/xmloff sc/sourc

[Stephan Bergmann]

 basctl/source/basicide/documentenumeration.cxx|3 +++
 connectivity/source/commontools/TTableHelper.cxx  |1 +
 connectivity/source/commontools/dbtools.cxx   |1 +
 cui/source/options/dbregistersettings.hxx |7 +--
 dbaccess/source/core/dataaccess/datasource.cxx|2 ++
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|   10 +-
 dbaccess/source/ui/dlg/DbAdminImpl.hxx|4 
 dbaccess/source/ui/dlg/dsselect.cxx   |2 +-
 dbaccess/source/ui/inc/commontypes.hxx|6 +-
 dbaccess/source/ui/inc/dsmeta.hxx |4 
 dbaccess/source/ui/misc/dsmeta.cxx|2 +-
 extensions/source/abpilot/abptypes.hxx|6 +-
 extensions/source/abpilot/datasourcehandling.cxx  |2 +-
 extensions/source/abpilot/tableselectionpage.cxx  |2 +-
 extensions/source/dbpilots/dbptypes.hxx   |6 +-
 filter/source/svg/svgfontexport.hxx   |   10 --
 include/comphelper/stl_types.hxx  |   18 ++
 include/connectivity/dbcharset.hxx|3 ++-
 include/xmloff/txtimp.hxx |3 +--
 include/xmloff/xmlimp.hxx |3 +++
 sc/source/filter/xml/xmlfilti.hxx |1 +
 sd/source/ui/framework/module/ResourceManager.cxx |3 +--
 svx/source/inc/fmexch.hxx |4 
 svx/source/unodraw/UnoNameItemTable.cxx   |7 +++
 svx/source/unodraw/UnoNamespaceMap.cxx|9 +++--
 svx/source/unodraw/unomtabl.cxx   |9 -
 sw/source/filter/xml/xmltexti.cxx |6 +++---
 sw/source/filter/xml/xmltexti.hxx |2 +-
 xmloff/inc/txtlists.hxx   |7 ++-
 xmloff/source/draw/sdxmlexp_impl.hxx  |4 ++--
 xmloff/source/draw/sdxmlimp_impl.hxx  |1 +
 xmloff/source/forms/elementexport.cxx |4 ++--
 xmloff/source/forms/elementexport.hxx |6 +-
 xmloff/source/forms/layerexport.hxx   |4 
 xmloff/source/forms/propertyexport.cxx|2 +-
 xmloff/source/forms/propertyexport.hxx|6 +-
 xmloff/source/forms/propertyimport.hxx|6 +-
 xmloff/source/style/MultiPropertySetHelper.cxx|2 --
 xmloff/source/style/prstylei.cxx  |2 +-
 xmloff/source/text/XMLPropertyBackpatcher.hxx |5 ++---
 xmloff/source/text/XMLTextFrameContext.cxx|3 +--
 xmloff/source/text/txtimp.cxx |8 ++--
 xmloff/source/transform/MetaTContext.hxx  |4 +---
 43 files changed, 114 insertions(+), 86 deletions(-)

New commits:
commit 895e6e7bb7abddb135f6fe3cfef1505261d4cbc6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 5 18:34:54 2013 +0100

Get rid of comphelper::UStringLess

...default std::lessOUString is just fine.

Change-Id: Ib9d3c10f2817d757f3c19eb3d4607095883af91a

diff --git a/cui/source/options/dbregistersettings.hxx 
b/cui/source/options/dbregistersettings.hxx
index d59136b..68063d9 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
 #define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
 
-#include comphelper/stl_types.hxx
+#include sal/config.h
+
+#include map
+
 #include svl/poolitem.hxx
 
 //
@@ -58,7 +61,7 @@ namespace svx
 }
 };
 
-typedef ::std::map OUString, DatabaseRegistration, 
::comphelper::UStringLessDatabaseRegistrations;
+typedef ::std::map OUString, DatabaseRegistration  DatabaseRegistrations;
 
 //
 //= DatabaseMapItem
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx 
b/dbaccess/source/ui/misc/dsmeta.cxx
index 39a7315..97a5bd2 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -86,7 +86,7 @@ namespace dbaui
 
 static const FeatureSet lcl_getFeatureSet( const OUString _rURL )
 {
-typedef ::std::map OUString, FeatureSet, ::comphelper::UStringLess   
  FeatureSets;
+typedef ::std::map OUString, FeatureSet  FeatureSets;
 static FeatureSets s_aFeatureSets;
 if ( s_aFeatureSets.empty() )
 {
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index 9d129c2..228da5b 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -44,12 +44,6 @@ namespace comphelper
 //
 // comparison functors
 
-//
-struct UStringLess : public 

[Libreoffice-commits] core.git: ios/CustomTarget_MobileLibreOffice_app.mk

[Tor Lillqvist]

 ios/CustomTarget_MobileLibreOffice_app.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dfe3df890a3649aa0b407d34e0248c74a9e25c2f
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 20:07:46 2013 +0200

Make this actually work both when SRCDIR equals and not equals BUILDIR

Change-Id: I0287820bf0b5a1f0645bd032fb1071db5ce168c5

diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk 
b/ios/CustomTarget_MobileLibreOffice_app.mk
index e517e42..27a029c 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -44,9 +44,9 @@ MobileLibreOffice_setup:
# Libs #
# Create the link flags in the xcconfig for Xcode linkage
all_libs=`$(SRCDIR)/bin/lo-all-static-libs`; \
-   sed -i '' -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs| $(LO_XCCONFIG)
+   sed -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$all_libs|  
$(BUILDDIR)/ios/$(LO_XCCONFIG)  $(BUILDDIR)/ios/$(LO_XCCONFIG).new  mv 
$(BUILDDIR)/ios/$(LO_XCCONFIG).new $(BUILDDIR)/ios/$(LO_XCCONFIG)
 
-   # Copy lo.xcconfig to source dir for Xcode projects
+   # Copy lo.xcconfig to source dir for the Xcode projects
if test $(SRCDIR) != $(BUILDDIR); then \
cp $(BUILDDIR)/ios/$(LO_XCCONFIG) $(SRCDIR)/ios; \
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlhelp/source

[Herbert Dürr]

 xmlhelp/source/com/sun/star/help/HelpSearch.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d12312e8de0f0af1b3f7be5ced034972e32948bf
Author: Herbert Dürr h...@apache.org
Date:   Thu Dec 5 16:21:20 2013 +

#i122871# fix Help search finding more than 100 items

fixing the allocation size for the search result prevents
an ArrayIndexOutOfBoundException so that the search can
finish successfully

Patch by: hanya.r...@gmail.com
Review by: h...@apache.org

diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java 
b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index 0f7f315..a95fd91 100644
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -273,7 +273,7 @@ public class HelpSearch
 
 // Perform search
 TopDocs aHits = searcher.search( aQuery, 100 );
-int nHitCount = aHits.totalHits;
+int nHitCount = aHits.scoreDocs.length;
 
 String aDocs[] = new String[nHitCount];
 float aScores[] = null;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/app/svdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 689bcd929fbc3b9cd28193e4a171fbe16cad8c01
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 5 21:02:39 2013 +0200

I think SAL_FORCE_IACCESSIBLE2 is what is intended here

Change-Id: If03696cfcc9a3d5053af881e00a4c6a484cbd445

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 500e18d..d326335 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -295,7 +295,7 @@ bool ImplInitAccessBridge()
 css::uno::Reference XComponentContext  
xContext(comphelper::getProcessComponentContext());
 
 #ifdef _WIN32
-if (!HasAtHook()  !getenv(SAL_DISABLE_IACCESSIBLE2))
+if (!HasAtHook()  !getenv(SAL_FORCE_IACCESSIBLE2))
 {
 SAL_INFO(vcl, Apparently no running AT - 
  not enabling IAccessible2 integration);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/ui/app/inputhdl.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 40fba2316ac3ebb11b69c157cfac7da92a63821b
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 20:28:29 2013 +0100

fixed out of bounds string access

Change-Id: I25f53f16c3ddc3456c165b6c604911433f460228

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 00bcf3c..08996c4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1247,11 +1247,15 @@ static void lcl_CompleteFunction( EditView* pView, 
const OUString rInsert, bool
 
 ESelection aWordSel = pView-GetSelection();
 OUString aOld = pView-GetEditEngine()-GetText(0);
-sal_Unicode cNext = aOld[aWordSel.nEndPos];
-if ( cNext == '(' )
+// aWordSel.EndPos points one behind string if word at end.
+if (aWordSel.nEndPos  aOld.getLength())
 {
-bDoParen = false;
-aInsStr = aInsStr.copy( 0, nInsLen - 2 );   // Klammern 
weglassen
+sal_Unicode cNext = aOld[aWordSel.nEndPos];
+if ( cNext == '(' )
+{
+bDoParen = false;
+aInsStr = aInsStr.copy( 0, nInsLen - 2 );   // Klammern 
weglassen
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Eike Rathke]

 sc/source/ui/app/inputhdl.cxx |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 6f2c7baccd4835508582abc429ca70c3e12a7496
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 5 20:28:29 2013 +0100

fixed out of bounds string access

Change-Id: I25f53f16c3ddc3456c165b6c604911433f460228
(cherry picked from commit 40fba2316ac3ebb11b69c157cfac7da92a63821b)

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 8001e67..f0f6cf8 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1249,11 +1249,15 @@ static void lcl_CompleteFunction( EditView* pView, 
const OUString rInsert, bool
 
 ESelection aWordSel = pView-GetSelection();
 OUString aOld = pView-GetEditEngine()-GetText(0);
-sal_Unicode cNext = aOld[aWordSel.nEndPos];
-if ( cNext == '(' )
+// aWordSel.EndPos points one behind string if word at end.
+if (aWordSel.nEndPos  aOld.getLength())
 {
-bDoParen = false;
-aInsStr = aInsStr.copy( 0, nInsLen - 2 );   // Klammern 
weglassen
+sal_Unicode cNext = aOld[aWordSel.nEndPos];
+if ( cNext == '(' )
+{
+bDoParen = false;
+aInsStr = aInsStr.copy( 0, nInsLen - 2 );   // Klammern 
weglassen
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Navigation buttons in Writer Search bar

[Rodolfo]

If the button fires an UNO command, you should
A) create an icon in an icon theme pack/folder. It should be named
lc_unocommandname.png for large icons and sc_unocommandname.png for small
ones.
B) or, if you want to reuse an existant icon, you can make a link to it:
add its name to a text file called links.txt in theme directory. Example
line:
cmd/lc_newunocommandname.png cmd/lc_existanticon.png

Sorry if I was not clear. Answering by mobile.

Regards,
Rodolfo.
Em 05/12/2013 06:30, Samuel Mehrbrodt s.mehrbr...@gmail.com escreveu:

  Hi,

 I'm trying to add the Navigation buttons that were below the scrollbar in
 Writer to the Search bar, as discussed on UX-Advise.

 Now I have the Next and Previous buttons working, but have two
 questions:

 - How can I display an Image instead of text in the toolbar?
 - I have a new Uno Command for showing the Navigation window (
 uno:NavigationPopup) and I catch it in sw/source/ui/uiview/view2.cxx. Now
 I need to implement something like [1] (new  SwScrollNaviPopup ...).
 Where should I implement this? It doesn't seem right to me to do it
 directly in view2.cxx.

 Thanks
 Samuel

 [1]
 http://cgit.freedesktop.org/libreoffice/core/diff/sw/source/ui/ribbar/workctrl.cxx?id=3e8fe4d8e19be2ccd8f5bb898530e2f615a90321

 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dputil.hxx|8 +++-
 sc/inc/pivot.hxx |7 +--
 sc/source/core/data/dpobject.cxx |6 ++
 sc/source/core/data/dputil.cxx   |   21 +
 sc/source/core/data/pivot2.cxx   |7 ---
 sc/source/ui/dbgui/pvfundlg.cxx  |   34 +++---
 sc/source/ui/dbgui/pvlaydlg.cxx  |7 +--
 sc/source/ui/inc/pvfundlg.hxx|4 ++--
 8 files changed, 73 insertions(+), 21 deletions(-)

New commits:
commit 7e491281d2ba71490fa22cce1e43ba91f60395e3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 15:37:10 2013 -0500

fdo#69984: Handle duplicate field names correctly.

Duplicate field names are represented in two ways: 1) 'Name' vs 'Name*' in
the UNO part of the pivot engine, and 2) Name,0 vs Name,1 which are a pair
of textural name and a numeric duplicate index in the non-UNO part of the
engine.  But some parts lost this duplicate index information and/or 
confused
the 2 ways of representation.  Hopefully this change will sort things out.

Change-Id: I03ae7b6c011c31ace454679837542d6d0909ecaa

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 294ca97..e4ed831 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -26,7 +26,13 @@ public:
 
 SC_DLLPUBLIC static OUString getSourceDimensionName(const OUString rName);
 
-static OUString createDuplicateDimensionName(const OUString rOriginal, 
size_t nDupCount);
+/**
+ * Get a duplicate index in case the dimension is a duplicate.  It returns
+ * 0 in case it's an original dimension.
+ */
+sal_uInt8 static getDuplicateIndex(const OUString rName);
+
+SC_DLLPUBLIC static OUString createDuplicateDimensionName(const OUString 
rOriginal, size_t nDupCount);
 
 static OUString getDateGroupName(
 sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter,
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 6c9b03e..cd74a99 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -51,12 +51,14 @@
 #include com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp
 #include com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp
 
-struct ScDPName
+struct SC_DLLPUBLIC ScDPName
 {
 OUString maName; /// Original name of the dimension.
 OUString maLayoutName;   /// Layout name (display name)
+sal_uInt8 mnDupCount;
 
-explicit ScDPName(const OUString rName, const OUString rLayoutName);
+ScDPName();
+explicit ScDPName(const OUString rName, const OUString rLayoutName, 
sal_uInt8 nDupCount);
 };
 
 struct ScDPLabelData
@@ -69,6 +71,7 @@ struct ScDPLabelData
 sal_uInt16  mnFuncMask; /// Page/Column/Row subtotal function.
 sal_Int32   mnUsedHier; /// Used hierarchy.
 sal_Int32   mnFlags;/// Flags from the DataPilotSource 
dimension
+sal_uInt8   mnDupCount;
 boolmbShowAll:1;/// true = Show all (also empty) 
results.
 boolmbIsValue:1;/// true = Sum or count in data field.
 boolmbDataLayout:1;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index bab3988..4dca258 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1840,10 +1840,16 @@ bool ScDPObject::FillLabelDataForDimension(
 xDimProp, OUString(SC_UNO_DP_FIELD_SUBTOTALNAME), OUString());
 
 bool bIsValue = true;   //! check
+
+// Name from the UNO dimension object may have trailing '*'s in which
+// case it's a duplicate dimension. Convert that to a duplicate index.
+
+sal_uInt8 nDupCount = ScDPUtil::getDuplicateIndex(aFieldName);
 aFieldName = ScDPUtil::getSourceDimensionName(aFieldName);
 
 rLabelData.maName = aFieldName;
 rLabelData.mnCol = static_castSCCOL(nDim);
+rLabelData.mnDupCount = nDupCount;
 rLabelData.mbDataLayout = bData;
 rLabelData.mbIsValue = bIsValue;
 
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 40cfafb..e21b2a8 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -64,6 +64,27 @@ OUString ScDPUtil::getSourceDimensionName(const OUString 
rName)
 return comphelper::string::stripEnd(rName, '*');
 }
 
+sal_uInt8 ScDPUtil::getDuplicateIndex(const OUString rName)
+{
+// Count all trailing '*'s.
+
+sal_Int32 n = rName.getLength();
+if (!n)
+return 0;
+
+sal_uInt8 nDupCount = 0;
+const sal_Unicode* p = rName.getStr();
+const sal_Unicode* pStart = p;
+p += n-1; // Set it to the last char.
+for (; p != pStart; --p, ++nDupCount)
+{
+if (*p != '*')
+break;
+}
+
+return nDupCount;
+}
+
 OUString ScDPUtil::createDuplicateDimensionName(const OUString rOriginal, 
size_t nDupCount)
 {
 if (!nDupCount)
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dputil.hxx|8 +++-
 sc/inc/pivot.hxx |7 +--
 sc/source/core/data/dpobject.cxx |6 ++
 sc/source/core/data/dputil.cxx   |   21 +
 sc/source/core/data/pivot2.cxx   |7 ---
 sc/source/ui/dbgui/pvfundlg.cxx  |   34 +++---
 sc/source/ui/dbgui/pvlaydlg.cxx  |7 +--
 sc/source/ui/inc/pvfundlg.hxx|4 ++--
 8 files changed, 73 insertions(+), 21 deletions(-)

New commits:
commit ba0204675724ada537db63999d73ac8174b24949
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 5 15:37:10 2013 -0500

fdo#69984: Handle duplicate field names correctly.

Duplicate field names are represented in two ways: 1) 'Name' vs 'Name*' in
the UNO part of the pivot engine, and 2) Name,0 vs Name,1 which are a pair
of textural name and a numeric duplicate index in the non-UNO part of the
engine.  But some parts lost this duplicate index information and/or 
confused
the 2 ways of representation.  Hopefully this change will sort things out.

Change-Id: I03ae7b6c011c31ace454679837542d6d0909ecaa
(cherry picked from commit 7e491281d2ba71490fa22cce1e43ba91f60395e3)

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 294ca97..e4ed831 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -26,7 +26,13 @@ public:
 
 SC_DLLPUBLIC static OUString getSourceDimensionName(const OUString rName);
 
-static OUString createDuplicateDimensionName(const OUString rOriginal, 
size_t nDupCount);
+/**
+ * Get a duplicate index in case the dimension is a duplicate.  It returns
+ * 0 in case it's an original dimension.
+ */
+sal_uInt8 static getDuplicateIndex(const OUString rName);
+
+SC_DLLPUBLIC static OUString createDuplicateDimensionName(const OUString 
rOriginal, size_t nDupCount);
 
 static OUString getDateGroupName(
 sal_Int32 nDatePart, sal_Int32 nValue, SvNumberFormatter* pFormatter,
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 6c9b03e..cd74a99 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -51,12 +51,14 @@
 #include com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp
 #include com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp
 
-struct ScDPName
+struct SC_DLLPUBLIC ScDPName
 {
 OUString maName; /// Original name of the dimension.
 OUString maLayoutName;   /// Layout name (display name)
+sal_uInt8 mnDupCount;
 
-explicit ScDPName(const OUString rName, const OUString rLayoutName);
+ScDPName();
+explicit ScDPName(const OUString rName, const OUString rLayoutName, 
sal_uInt8 nDupCount);
 };
 
 struct ScDPLabelData
@@ -69,6 +71,7 @@ struct ScDPLabelData
 sal_uInt16  mnFuncMask; /// Page/Column/Row subtotal function.
 sal_Int32   mnUsedHier; /// Used hierarchy.
 sal_Int32   mnFlags;/// Flags from the DataPilotSource 
dimension
+sal_uInt8   mnDupCount;
 boolmbShowAll:1;/// true = Show all (also empty) 
results.
 boolmbIsValue:1;/// true = Sum or count in data field.
 boolmbDataLayout:1;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index bab3988..4dca258 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1840,10 +1840,16 @@ bool ScDPObject::FillLabelDataForDimension(
 xDimProp, OUString(SC_UNO_DP_FIELD_SUBTOTALNAME), OUString());
 
 bool bIsValue = true;   //! check
+
+// Name from the UNO dimension object may have trailing '*'s in which
+// case it's a duplicate dimension. Convert that to a duplicate index.
+
+sal_uInt8 nDupCount = ScDPUtil::getDuplicateIndex(aFieldName);
 aFieldName = ScDPUtil::getSourceDimensionName(aFieldName);
 
 rLabelData.maName = aFieldName;
 rLabelData.mnCol = static_castSCCOL(nDim);
+rLabelData.mnDupCount = nDupCount;
 rLabelData.mbDataLayout = bData;
 rLabelData.mbIsValue = bIsValue;
 
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 40cfafb..e21b2a8 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -64,6 +64,27 @@ OUString ScDPUtil::getSourceDimensionName(const OUString 
rName)
 return comphelper::string::stripEnd(rName, '*');
 }
 
+sal_uInt8 ScDPUtil::getDuplicateIndex(const OUString rName)
+{
+// Count all trailing '*'s.
+
+sal_Int32 n = rName.getLength();
+if (!n)
+return 0;
+
+sal_uInt8 nDupCount = 0;
+const sal_Unicode* p = rName.getStr();
+const sal_Unicode* pStart = p;
+p += n-1; // Set it to the last char.
+for (; p != pStart; --p, ++nDupCount)
+{
+if (*p != '*')
+break;
+}
+
+return nDupCount;
+}
+
 OUString ScDPUtil::createDuplicateDimensionName(const OUString rOriginal, 
size_t nDupCount)
 {
 if (!nDupCount)
diff 

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 69984, which changed state.

Bug 69984 Summary: PIVOTTABLE: Pivot table reset sorting after editing
https://bugs.freedesktop.org/show_bug.cgi?id=69984

   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