[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on||60627

--- Comment #2 from Rainer Bielefeld  ---
Add "Bug 60627 - EDITING: CRASH when 'Format - Bullets and Numbering'"

-- 
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

[Maxime de Roucy]

 sw/source/core/doc/docnum.cxx|7 +--
 sw/source/core/txtnode/ndtxt.cxx |8 ++--
 sw/source/filter/ww8/ww8par6.cxx |4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 7841fd1536e018defaf9cbeb283cb82b687f95e1
Author: Maxime de Roucy 
Date:   Fri Feb 8 14:54:36 2013 +0100

use static/reinterpret_cast and minor rewrite

Change-Id: I9d2f21394c03e29d573dc197da90a91c96d55409
Reviewed-on: https://gerrit.libreoffice.org/2047
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Norbert Thiebaud 

diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 25d043b..b4078c8 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1357,11 +1357,14 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
 pTNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
 
 if( RES_CONDTXTFMTCOLL == pTNd->GetFmtColl()->Which() )
+{
 pTNd->ChkCondColl();
-
+}
 else if( !pOutlNd &&
-
((SwTxtFmtColl*)pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle() 
)//<-end,zhaojianwei
+ 
static_cast(pTNd->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle()
 )//<-end,zhaojianwei
+{
 pOutlNd = pTNd;
+}
 }
 }
 
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 703e632..4881fb5 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2348,9 +2348,7 @@ SwNumRule* SwTxtNode::_GetNumRule(sal_Bool bInParent) 
const
 
 SwNumRule* SwTxtNode::GetNumRule(sal_Bool bInParent) const
 {
-SwNumRule * pRet = _GetNumRule(bInParent);
-
-return pRet;
+return _GetNumRule(bInParent);
 }
 
 void SwTxtNode::NumRuleChgd()
@@ -4845,9 +4843,7 @@ sal_uInt32 SwTxtNode::GetRsid( xub_StrLen nStt, 
xub_StrLen nEnd ) const
 
 sal_uInt32 SwTxtNode::GetParRsid() const
 {
-SvxRsidItem &rItem = ( SvxRsidItem& ) GetAttr( RES_PARATR_RSID );
-
-return rItem.GetValue();
+return reinterpret_cast(GetAttr( RES_PARATR_RSID 
)).GetValue();
 }
 
 bool SwTxtNode::CompareParRsid( const SwTxtNode &rTxtNode ) const
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 761a68a..c4f260e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3827,10 +3827,10 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const 
sal_uInt8* pData, short nLe
 SvxLRSpaceItem aLR( RES_LR_SPACE );
 const SfxPoolItem* pLR = GetFmtAttr(RES_LR_SPACE);
 if( pLR )
-aLR = *(const SvxLRSpaceItem*)pLR;
+aLR = *static_cast(pLR);
 
 // Fix the regression issue: #i99822#: Discussion?
-// Since the list lever formatting doesn't apply into paragraph style
+// Since the list level formatting doesn't apply into paragraph style
 // for list levels of mode LABEL_ALIGNMENT.(see ww8par3.cxx
 // W8ImplReader::RegisterNumFmtOnTxtNode).
 // Need to apply the list format to the paragraph here.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 sw/source/core/crsr/crsrsh.cxx |4 ++--
 sw/source/core/crsr/pam.cxx|2 +-
 sw/source/core/doc/doc.cxx |6 +++---
 sw/source/core/doc/doccomp.cxx |2 +-
 sw/source/core/doc/doccorr.cxx |2 +-
 sw/source/core/doc/docdraw.cxx |2 +-
 sw/source/core/doc/tblrwcl.cxx |6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 0b081027fecbfdcdee6ab4e36e22123f3cd4cfde
Author: Matthias Freund 
Date:   Sun Feb 10 22:05:58 2013 +0100

Comment translation german - english

Change-Id: I76c5124ff13abe4610b8cc9a07ba75e038c02e8b
Reviewed-on: https://gerrit.libreoffice.org/2092
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a87677f..e417c92 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2017,7 +2017,7 @@ void SwCrsrShell::HideCrsr()
 if( !bBasicHideCrsr )
 {
 bSVCrsrVis = sal_False;
-// evt. die sel. Bereiche aufheben !!
+// possibly reverse selected areas!!
 SET_CURR_SHELL( this );
 pVisCrsr->Hide();
 }
@@ -2529,7 +2529,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
 SwNodes& rNds = rDoc.GetNodes();
 
 SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
-SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // gehe zum 1. ContentNode
+SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first 
ContentNode
 
 pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 
)));
 
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 505477a..741679e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -667,7 +667,7 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
 if( pFmt->GetProtect().IsCntntProtected() )
 {
 const SwFmtCntnt& rCntnt = pFmt->GetCntnt(sal_False);
-OSL_ENSURE( rCntnt.GetCntntIdx(), "wo ist der 
SectionNode?" );
+OSL_ENSURE( rCntnt.GetCntntIdx(), "where is the 
SectionNode?" );
 sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
 if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
 
rCntnt.GetCntntIdx()->GetNode().GetNodes().IsDocNodes() )
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 80cfa84..993eefc 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1221,7 +1221,7 @@ bool sw_GetPostIts(
 bool bHasPostIts = false;
 
 SwFieldType* pFldType = pIDFA->GetSysFldType( RES_POSTITFLD );
-OSL_ENSURE( pFldType, "kein PostItType ? ");
+OSL_ENSURE( pFldType, "no PostItType ? ");
 
 if( pFldType->GetDepends() )
 {
@@ -1575,7 +1575,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
 sal_Int32 i = 0;
 for ( i = 1; pStPage && i < nDocPageCount; ++i )
 pStPage = (SwPageFrm*)pStPage->GetNext();
-if ( !pStPage )  // dann wars das
+if ( !pStPage )  // Then it was that
 return;
 
 // currently for prospect printing all pages are valid to be printed
@@ -2486,7 +2486,7 @@ bool SwDoc::LinksUpdated() const
 return mbLinksUpdated;
 }
 
-// embedded alle lokalen Links (Bereiche/Grafiken)
+// embedded all local links (Areas/Graphics)
 static ::sfx2::SvBaseLink* lcl_FindNextRemovableLink( const 
::sfx2::SvBaseLinks& rLinks, sfx2::LinkManager& rLnkMgr )
 {
 for( sal_uInt16 n = 0; n < rLinks.size(); ++n )
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 594b03b..0df87ac 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -497,7 +497,7 @@ void Hash::CalcHashValue( CompareData& rData )
 for( size_t n = 0; n < rData.GetLineCount(); ++n )
 {
 const CompareLine* pLine = rData.GetLine( n );
-OSL_ENSURE( pLine, "wo ist die Line?" );
+OSL_ENSURE( pLine, "where is the line?" );
 sal_uLong nH = pLine->GetHashValue();
 
 sal_uLong* pFound = &pHashArr[ nH % nPrime ];
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 2379c71..50868ea 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -319,7 +319,7 @@ void SwDoc::CorrRel(const SwNodeIndex& rOldNode,
 SwPosition aNewPos(rNewPos);
 for( sal_uInt16 n = 0; n < rTbl.size(); ++n )
 {
-// liegt auf der Position ??
+// lies on the position ??
 lcl_PaMCorrRel1( rTbl[ n ], &rOldNode.GetNode(), aNewPos, 
aNewPos.nContent.GetIndex() + nOffset );
 }
 }
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 25a5a4e..c8d9ed3 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -523,7 +523,7 @@ 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - setup_native/source

[Julien Nabet]

 setup_native/source/win32/wintools/makecab/parseddf.c |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 56215a00ed256977b802e0a742cf13a481b234cb
Author: Julien Nabet 
Date:   Fri Feb 8 22:53:18 2013 +0100

Fix Resource leak: ddf

Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479
Reviewed-on: https://gerrit.libreoffice.org/2057
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Norbert Thiebaud 
Reviewed-on: https://gerrit.libreoffice.org/2080
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/setup_native/source/win32/wintools/makecab/parseddf.c 
b/setup_native/source/win32/wintools/makecab/parseddf.c
index cbd9914..cf081e3 100644
--- a/setup_native/source/win32/wintools/makecab/parseddf.c
+++ b/setup_native/source/win32/wintools/makecab/parseddf.c
@@ -378,6 +378,8 @@ DDFERR ParseDdf(char* ddfFile, PCCAB ccab, DDFSRCFILE ** 
srcListH, unsigned int
 ccab->cbFolderThresh = ccab->cb;
 ccab->iDisk = 0;
 
+fclose(ddf);
+
 return DDF_OK;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Joren De Cuyper]

 vcl/uiconfig/ui/printdialog.ui |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9b2c0cb728873c018ca18e5e5e9bd2d2b84530be
Author: Joren De Cuyper 
Date:   Sat Feb 9 20:59:06 2013 +0100

add 6 width border to toplevel widgets of printdialog

Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3
Reviewed-on: https://gerrit.libreoffice.org/2067
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 227063e..a49737e 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -190,6 +190,7 @@
   
 True
 False
+6
 vertical
 
   
@@ -910,6 +911,7 @@
   
 True
 False
+6
 vertical
 
   
@@ -934,6 +936,7 @@
   
 True
 False
+6
 vertical
 
   
@@ -1368,6 +1371,7 @@
   
 True
 False
+6
 0
 none
 
___
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 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dde8e266084c89860a9a91f2a29ac31b730a9c4a
Author: Caolán McNamara 
Date:   Sun Feb 10 21:34:31 2013 +

resorted SvTreeLists munged horribly

e.g. tools->options->paths, click the sort icon, reclick it few
times and the list doesn't reverse but instead shows the
same two entries over and over again.

Regression since fb01d8e132ab9097ed30b3bc4c7585622df591ad

Change-Id: Ifc151ad72a27f1cdc3141e356ad6d100e6219cc2

diff --git a/svtools/source/contnr/treelist.cxx 
b/svtools/source/contnr/treelist.cxx
index 90a03d2..307d861 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1554,6 +1554,7 @@ void SvTreeList::ResortChildren( SvTreeListEntry* pParent 
)
 // Recursively sort child entries.
 ResortChildren(p);
 }
+SetListPositions(pParent->maChildren); // correct list position in target 
list
 }
 
 void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* 
pParent,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - wizards/com

[Xisco Fauli]

 wizards/com/sun/star/wizards/agenda/AgendaDocument.py |   93 +++---
 1 file changed, 38 insertions(+), 55 deletions(-)

New commits:
commit efa0451d8eab878812e2bbacc4319d7490d0f333
Author: Xisco Fauli 
Date:   Sun Feb 10 22:14:45 2013 +0100

pyagenda: remove placeholder when text is not empty

Change-Id: I06ae1815ec1bd904e944929f1b50a0ee95a6a5ae

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py 
b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index c993d62..07b3f35 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -662,7 +662,6 @@ class ItemsTable(object):
 # should this section be visible?
 visible = False
 # write items
-# ===
 cellName = ""
 '''
 now go through all items that belong to this
@@ -689,8 +688,6 @@ class ItemsTable(object):
 if not visible:
 return
 '''
-remove obsolete rows
-
 if the cell that was last written is the current cell,
 it means this is the end of the table, so we end here.
 (because after getting the cellName above,
@@ -889,6 +886,7 @@ class PlaceholderTextElement(TextElement):
 self.text = placeHolderText_
 self.hint = hint_
 self.xmsf = xmsf_
+self.xTextContentList = []
 
 def write(self, textRange):
 textRange.String = self.placeHolderText
@@ -896,11 +894,16 @@ class PlaceholderTextElement(TextElement):
 try:
 xTextContent = AgendaDocument.createPlaceHolder(
 self.xmsf, self.text, self.hint)
+self.xTextContentList.append(xTextContent)
 textRange.Text.insertTextContent(
 textRange.Start, xTextContent, True)
 except Exception:
 traceback.print_exc()
-
+else:
+if self.xTextContentList:
+for i in self.xTextContentList:
+textRange.Text.removeTextContent(i)
+self.xTextContentList = []
 '''
 An Agenda element which writes no text, but inserts a placeholder, and formats
 it using a ParaStyleName.
commit 2f7bd777d9724ff3b6c7697bf7c02d32eb661214
Author: Xisco Fauli 
Date:   Sun Feb 10 21:15:19 2013 +0100

pyagenda: This shouldn't be commented

Change-Id: I95dde2a3673f3304969329623af7f615b7388654

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py 
b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index eb57f97..c993d62 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -872,9 +872,9 @@ class Topics(object):
 
 tableRows = Topics.table.Rows
 targetNumOfRows = topics * Topics.rowsPerTopic + 1
-'''if tableRows.Count > targetNumOfRows:
+if tableRows.Count > targetNumOfRows:
 tableRows.removeByIndex(
-targetNumOfRows, tableRows.Count - targetNumOfRows)'''
+targetNumOfRows, tableRows.Count - targetNumOfRows)
 
 '''
 A Text element which, if the text to write is empty (null or "")
commit b4743abd03fb584cfc05361dff1b93eae4cf9867
Author: Xisco Fauli 
Date:   Sun Feb 10 18:26:04 2013 +0100

pyagenda: use local variables

Change-Id: I9fe8eae42c942823df3d200ebb0a0ae1c478d29a

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py 
b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
index 25ecf04..eb57f97 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaDocument.py
@@ -280,13 +280,10 @@ class AgendaDocument(TextDocument):
 Get the default locale of the document,
 and create the date and time formatters.
 '''
-AgendaDocument.dateUtils = self.DateUtils(
-self.xMSF, self.xTextDocument)
-AgendaDocument.formatter = AgendaDocument.dateUtils.formatter
-AgendaDocument.dateFormat = \
-AgendaDocument.dateUtils.getFormat(DATE_SYSTEM_LONG)
-AgendaDocument.timeFormat = \
-AgendaDocument.dateUtils.getFormat(TIME_HHMM)
+self.dateUtils = self.DateUtils(self.xMSF, self.xTextDocument)
+self.formatter = self.dateUtils.formatter
+self.dateFormat = self.dateUtils.getFormat(DATE_SYSTEM_LONG)
+self.timeFormat = self.dateUtils.getFormat(TIME_HHMM)
 
 self.initItemsCache()
 self.allItems = self.searchFillInItems(0)
@@ -306,29 +303,25 @@ class AgendaDocument(TextDocument):
 for i in self.allItems:
 text = i.String.lstrip().lower()
 if text == self.templateConsts.FILLIN_TITLE:
-AgendaDocument.teTitle = PlaceholderTextElement(
+self.teTitle = PlaceholderTextElement(
 i, self.resources.re

[Libreoffice-commits] core.git: python3/UnpackedTarball_python3.mk

[Miklos Vajna]

 python3/UnpackedTarball_python3.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b5dd63565509c2e02c193522a85d3dc6b60361d
Author: Miklos Vajna 
Date:   Sun Feb 10 21:41:54 2013 +0100

python3: 15833.patch makes sense with ro /usr on Linux as well

Change-Id: If0d7b17b97a78eddcdd02b3951afb7b2a1ae43ad

diff --git a/python3/UnpackedTarball_python3.mk 
b/python3/UnpackedTarball_python3.mk
index eb07def..d8c0862 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-ffi-clang.patch.1 \
 ))
 
-ifeq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-15833.patch.1 \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 sw/source/core/attr/hints.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fc5ba19c717986c3a00320e17c1b40447e52b2d0
Author: Matthias Freund 
Date:   Sun Feb 10 20:36:59 2013 +0100

Comment translation german - english

Change-Id: Ifc4be6a2253eaf89c996c0c2619b6d71e2fb5b5c
Reviewed-on: https://gerrit.libreoffice.org/2089
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index cd895eb..1db49a4 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -108,7 +108,7 @@ SwAttrSetChg::~SwAttrSetChg()
 #ifdef DBG_UTIL
 void SwAttrSetChg::ClearItem( sal_uInt16 nWhch )
 {
-OSL_ENSURE( bDelSet, "der Set darf nicht veraendert werden!" );
+OSL_ENSURE( bDelSet, "The Set may not be changed!" );
 pChgSet->ClearItem( nWhch );
 }
 #endif
@@ -121,13 +121,13 @@ SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch )
 // "Overhead" of SfxPoolItem
 int SwMsgPoolItem::operator==( const SfxPoolItem& ) const
 {
-OSL_FAIL( "SwMsgPoolItem kennt kein ==" );
+OSL_FAIL( "SwMsgPoolItem knows no ==" );
 return 0;
 }
 
 SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
 {
-OSL_FAIL( "SwMsgPoolItem kennt kein Clone" );
+OSL_FAIL( "SwMsgPoolItem knows no Clone" );
 return 0;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 sw/inc/swtypes.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 39a7b5e0415fa1752ae056fb7760b552e4350a1b
Author: Matthias Freund 
Date:   Sun Feb 10 20:21:45 2013 +0100

Comment translation german - english

I moved order so "git grep '\<\(der\|die\|das\)\>' sw" does not show up 
this file because of "der"

Change-Id: I98086993cf672806d763520b04e7693c8c772502
Reviewed-on: https://gerrit.libreoffice.org/2088
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index ad99ac8..1ea929e 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -283,8 +283,8 @@ enum PrepareHint
 // for it and sends a PREP_WIDOWS to its 
predecessor
 // (Master/Follow).
 PREP_QUOVADIS,  // If a footnote has to be split between two 
paragraphs
-// the last on the page has to receive a QUOVADIS 
in or-
-// der to format the text into it.
+// the last on the page has to receive a QUOVADIS 
in
+// order to format the text into it.
 PREP_BOSS_CHGD, // If a Frm changes its column/page this additional
 // Prepare is sended to POS_CHGD in MoveFwd/Bwd
 // (join Ftn-numbers etc.)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 sw/inc/swtable.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb4e96d8ea6539a505b6fcd04703b394d373ce24
Author: Matthias Freund 
Date:   Sun Feb 10 20:10:44 2013 +0100

Comment translation german - english

Change-Id: Id40b6528515a9ebcf3deb0f84597955723118a15
Reviewed-on: https://gerrit.libreoffice.org/2087
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 81f2696..fe018f6 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -141,7 +141,7 @@ public:
 virtual ~SwTable();
 
 // @@@ public copy ctor, but no copy assignment?
-SwTable( const SwTable& rTable );   // kein Copy der Lines !!
+SwTable( const SwTable& rTable );   // no copy of the lines !!
 private:
 // @@@ public copy ctor, but no copy assignment?
 SwTable & operator= (const SwTable &);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: bug/bug.xhtml

[Rob Snelders]

 bug/bug.xhtml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2358b74daabf767ab2c844776aa4d75cb7b258c5
Author: Rob Snelders 
Date:   Sun Feb 10 17:53:43 2013 +0100

- removed test-message again

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 70241f6..75c136f 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -74,7 +74,7 @@
 All your contributions will be public in WWW! By clicking the 
'Submit' button you irrevocably agree to release your contribution under the 
CC-BY-SA 3.0 License and the GFDL. If you can't agree to these terms for 
documents you planned to attach you can state in this report that such a 
document exists. QA team will discuss with you further proceeding in the bug.
   
   
-http://wiki.documentfoundation.org/Bug_Submission_Assistant";>Bug 
Submission Assistant is published under http://www.gnu.org/licenses/gpl.txt";>GNU GPLv3+. Download the sources 
with git clone http://cgit.freedesktop.org/libreoffice/website";>http://cgit.freedesktop.org/libreoffice/website.
 This is a test-message to see if we have the correct bugassistant.
+http://wiki.documentfoundation.org/Bug_Submission_Assistant";>Bug 
Submission Assistant is published under http://www.gnu.org/licenses/gpl.txt";>GNU GPLv3+. Download the sources 
with git clone http://cgit.freedesktop.org/libreoffice/website";>http://cgit.freedesktop.org/libreoffice/website.
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bug/bug.xhtml

[Rob Snelders]

 bug/bug.xhtml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 22d59d557f033865cd9a21f20d8a392d42b1a493
Merge: 5a9f807 2cd4a48
Author: Rob Snelders 
Date:   Sun Feb 10 17:41:04 2013 +0100

Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/website

commit 5a9f807742d3921f26607a3d6f0fdcfe418b1fe1
Author: Rob Snelders 
Date:   Sun Feb 10 17:35:30 2013 +0100

- added some text to see if we use the correct one

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 75c136f..70241f6 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -74,7 +74,7 @@
 All your contributions will be public in WWW! By clicking the 
'Submit' button you irrevocably agree to release your contribution under the 
CC-BY-SA 3.0 License and the GFDL. If you can't agree to these terms for 
documents you planned to attach you can state in this report that such a 
document exists. QA team will discuss with you further proceeding in the bug.
   
   
-http://wiki.documentfoundation.org/Bug_Submission_Assistant";>Bug 
Submission Assistant is published under http://www.gnu.org/licenses/gpl.txt";>GNU GPLv3+. Download the sources 
with git clone http://cgit.freedesktop.org/libreoffice/website";>http://cgit.freedesktop.org/libreoffice/website.
+http://wiki.documentfoundation.org/Bug_Submission_Assistant";>Bug 
Submission Assistant is published under http://www.gnu.org/licenses/gpl.txt";>GNU GPLv3+. Download the sources 
with git clone http://cgit.freedesktop.org/libreoffice/website";>http://cgit.freedesktop.org/libreoffice/website.
 This is a test-message to see if we have the correct bugassistant.
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Help update - Hyperlink Bar removal

[Stanislav Horáček]

Hi,

this patch for help removes the pages related to the Hyperlink Bar which was - if I understand it 
correctly - removed from LO completely.


Regards,
Stan
>From 66f9b6aa7e261946cf43e9cac441048b9f83a975 Mon Sep 17 00:00:00 2001
From: Stanislav Horacek 
Date: Sun, 10 Feb 2013 17:24:05 +0100
Subject: [PATCH] remove pages describing removed Hyperlink Bar

---
 helpers/help_hid.lst   |3 --
 helpers/longnames_commands.csv |1 -
 helpers/uno_hid.lst|1 -
 helpers/unocmds.txt|1 -
 source/text/shared/00/0406.xhp |2 --
 source/text/shared/02/0901.xhp |   69 
 source/text/shared/02/0902.xhp |   41 -
 source/text/shared/02/0903.xhp |   57 -
 source/text/shared/02/0906.xhp |   58 --
 source/text/shared/02/makefile.mk  |4 ---
 util/sbasic/makefile.mk|4 ---
 util/scalc/makefile.mk |4 ---
 util/schart/makefile.mk|4 ---
 util/sdatabase/makefile.mk |4 ---
 util/sdraw/makefile.mk |4 ---
 util/simpress/makefile.mk  |4 ---
 util/smath/makefile.mk |4 ---
 util/swriter/makefile.mk   |4 ---
 18 files changed, 269 deletions(-)
 delete mode 100644 source/text/shared/02/0901.xhp
 delete mode 100644 source/text/shared/02/0902.xhp
 delete mode 100644 source/text/shared/02/0903.xhp
 delete mode 100644 source/text/shared/02/0906.xhp

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d5a94b0..6a347fb 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2671,8 +2671,6 @@ HID_OFA_CONNPOOL_DRIVERLIST,35149,
 HID_OFA_FONT_SUBSTITUTION,35083,
 HID_OFA_FONT_SUBST_CLB,35084,
 HID_OFA_HYPERLINK_NAME,35079,
-HID_OFA_HYPERLINK_TARGET,35053,
-HID_OFA_HYPERLINK_URL,35081,
 HID_OFA_SUBST_APPLY,35085,
 HID_OFA_SUBST_DELETE,35086,
 HID_OFA_TP_LANGUAGES,35147,
@@ -5067,7 +5065,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
 SID_HTML_MODE,10414,.uno:HtmlMode
 SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
 SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
 SID_HYPHENATION,27340,.uno:Hyphenation
 SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
 SID_IMAGE_ORIENTATION,6667,.uno:ImageOrientation
diff --git a/helpers/longnames_commands.csv b/helpers/longnames_commands.csv
index b661d9e..e423fd2 100644
--- a/helpers/longnames_commands.csv
+++ b/helpers/longnames_commands.csv
@@ -1255,7 +1255,6 @@ SID_HORIZONTAL,.uno:MirrorHorz
 SID_HTML_MODE,.uno:HtmlMode
 SID_HYPERLINK_DIALOG,.uno:HyperlinkDialog
 SID_HYPERLINK_GETLINK,.uno:Hyperlink
-SID_HYPERLINK_SETLINK,.uno:SetHyperlink
 SID_HYPHENATION,.uno:Hyphenation
 SID_H_ALIGNCELL,.uno:HorizontalAlignment
 SID_IMAGE_ORIENTATION,.uno:ImageOrientation
diff --git a/helpers/uno_hid.lst b/helpers/uno_hid.lst
index f66bff7..4d6f16d 100644
--- a/helpers/uno_hid.lst
+++ b/helpers/uno_hid.lst
@@ -1253,7 +1253,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
 SID_HTML_MODE,10414,.uno:HtmlMode
 SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
 SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
 SID_HYPHENATION,27340,.uno:Hyphenation
 SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
 SID_IMAGE_ORIENTATION,6667,.uno:ImageOrientation
diff --git a/helpers/unocmds.txt b/helpers/unocmds.txt
index ee294bf..b7bb726 100644
--- a/helpers/unocmds.txt
+++ b/helpers/unocmds.txt
@@ -893,7 +893,6 @@
 .uno:SetColumnWidth;swriter/01/05120100.xhp
 .uno:SetDefault;shared/01/0501.xhp
 .uno:SetDocumentProperties;shared/01/0110.xhp
-.uno:SetHyperlink;shared/02/0903.xhp
 .uno:SetObjectToBackground;shared/01/05250600.xhp
 .uno:SetObjectToForeground;shared/01/05250500.xhp
 .uno:SetOptimalColumnWidth;scalc/01/05040200.xhp
diff --git a/source/text/shared/00/0406.xhp b/source/text/shared/00/0406.xhp
index 9c27258..14b60a9 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -241,8 +241,6 @@
 
   Choose %PRODUCTNAME - PreferencesTools - Options - Internet - Proxy
 
-  Choose %PRODUCTNAME - PreferencesTools - Options - Internet - Search
-
   Open a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer
 
   Open a text document, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Compatibility
diff --git a/source/text/shared/02/0901.xhp b/source/text/shared/02/0901.xhp
deleted file mode 100644
index 344d533..000
--- a/source/text/shared/02/0901.xhp
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-	
-
-
-
-URL Name
-/text/shared/02/0901.xhp
-
-
-Sun Microsystems, Inc.
-converted from old format - fpe
-
-
-
-
-
-URL Name
-Assigns a name to an Internet URL or file. You can also enter search criteria for an Internet search site.
-
-Possible search syntax is as follows:
-
-
-
-"Suite+Office"
-
-
-Finds all 

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

[Korrawit Pruegsanusak]

 sc/qa/unit/subsequent_filters-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80cbc04c2cbe25ebdfe2f22bb2e5ba62728e9632
Author: Korrawit Pruegsanusak 
Date:   Sun Feb 10 15:00:49 2013 +0700

sc_subsequent_filters-test: add bug number

from 84ae3c9853b7b90d7b859fd562dabc7b31e8deb8

Change-Id: I1768bfb7a68affe423485eff77b6005abde2e2a7
Reviewed-on: https://gerrit.libreoffice.org/2079
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 09d6373..63261f9 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -886,7 +886,7 @@ void ScFiltersTest::testBugFixesODS()
 ScDocument* pDoc = xDocSh->GetDocument();
 
 {
-// fdo
+// fdo#40967
 OUString aCSVFileName;
 createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("bugFix_Sheet2.")), 
aCSVFileName);
 testFile(aCSVFileName, pDoc, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 sw/inc/rcid.hrc |   48 
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 739edccf50c38d7a274be3a9510862eaca97c877
Author: Matthias Freund 
Date:   Sun Feb 10 14:00:58 2013 +0100

Comment translation german - english

Change-Id: I752eaaeaa9835efb010da376824b10f25085bede
Reviewed-on: https://gerrit.libreoffice.org/2085
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 9dd0961..96fefd5 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -22,7 +22,7 @@
 
 #define IMAGE_MASK_COLOR Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; }
 // 
-// Bereiche fuer die UI-Verzeichnisse
+// Areas for the UI-Directories
 // 
 
 #define RC_BASE RID_SW_START// From solar.hrc
@@ -71,14 +71,14 @@
 #define RC_IDXTXT   (RC_BASE + 4350)
 
 /*
-Beschreibung:   Bereiche ausspannen
+Description: areas unharness
  */
 
-// App-Verzeichnis
+// App-Directory
 #define RC_APP_BEGINRC_APP
 #define RC_APP_END  (RC_APP_BEGIN + 199)
 
-// Dialog-Verzeichnis
+// Dialog-Directory
 #define RC_DIALOG_BEGIN RC_DIALOG
 #define RC_DIALOG_END   (RC_DIALOG_BEGIN + 99)
 
@@ -106,15 +106,15 @@
 #define RC_VIEW_BEGIN   RC_VIEW
 #define RC_VIEW_END (RC_VIEW_BEGIN + 99)
 
-// Zeichen Absatz Tab-Dialog
+// Character Paragraph Tab-Dialog
 #define RC_CHRDLG_BEGIN RC_CHRDLG
 #define RC_CHRDLG_END   (RC_CHRDLG_BEGIN + 19)
 
-// Unsere Shell
+// Our Shell
 #define RC_WRTSH_BEGIN  RC_WRTSH
 #define RC_WRTSH_END(RC_WRTSH_BEGIN + 49)
 
-// Verzeichnisse
+// Directories
 #define RC_INDEX_BEGIN  RC_INDEX
 //  RC_INDEX_END(RC_INDEX + 99)
 
@@ -122,15 +122,15 @@
 #define RC_RIBBAR_BEGIN RC_RIBBAR
 #define RC_RIBBAR_END   (RC_RIBBAR_BEGIN + 79)
 
-// globale Resourcen
+// Global Resources
 #define RC_GLOBALS_BEGINRC_GLOBALS
 #define RC_GLOBALS_END  (RC_GLOBALS_BEGIN + 120)
 
-// Format-Vorlagen
+// Format-Templates
 #define RC_FMTUI_BEGIN  RC_FMTUI
 #define RC_FMTUI_END(RC_FMTUI_BEGIN + 69)
 
-// Grafik Dialoge
+// Graphic Dialogues
 #define RC_GRFDLG_BEGIN RC_GRFDLG
 //  RC_GRFDLG_END   (RC_GRFDLG_BEGIN + 99)
 
@@ -138,11 +138,11 @@
 #define RC_FSTDLG_BEGIN RC_FSTDLG
 //  RC_FSTDLG_END   (RC_FSTDLG_BEGIN + 99)
 
-// Rahmen Dialoge
+// Frame Dialogue
 #define RC_FRMDLG_BEGIN RC_FRMDLG
 #define RC_FRMDLG_END   (RC_FRMDLG_BEGIN + 99)
 
-// Feld Dialoge
+// Field Dialogue
 #define RC_FLDDLG_BEGIN RC_FLDDLG
 //  RC_FLDDLG_END   (RC_FLDDLG_BEGIN + 149)
 
@@ -150,20 +150,20 @@
 #define RC_UTLUI_BEGIN  RC_UTLUI
 #define RC_UTLUI_END(RC_UTLUI + 99)
 
-// Utilities UI-Attribute
+// Utilities UI-Attributes
 #define RC_ATTR_BEGIN   RC_ATTR
 #define RC_ATTR_END (RC_ATTR + 99)
 
-// Tabellen
+// Tables
 #define RC_TABLE_BEGIN  RC_TABLE
 #define RC_TABLE_END(RC_TABLE + 99)
 
-// Konfiguration
+// Configuration
 #define RC_CONFIG_BEGIN RC_CONFIG
 #define RC_CONFIG_END   (RC_CONFIG + 99)
 
 
-// Verschiedenes
+// Miscellaneous
 #define RC_MISC_BEGIN   RC_MISC
 #define RC_MISC_END (RC_MISC + 99)
 
@@ -171,18 +171,18 @@
 #define RC_DBUI_BEGIN   RC_DBUI
 //  RC_DBUI_END (RC_DBUI + 99)
 
-// Der Rest der Imp-Klassen
+// The rest of the Imp-Classes
 #define RC_DOCHDL_BEGIN RC_DOCHDL
 #define RC_DOCHDL_END   (RC_DOCHDL + 99)
 
-// Zeichenvorlagen
+// Drawing Templates
 #define RC_POOLCHRFMT_BEGIN RC_POOLCHRFMT
 //  RC_POOLCHRFMT_END   (RC_POOLCHRFMT + 29)
 #define RC_POOLCHRFMT_HTML_BEGINRC_POOLHTMLCHRFMT
 //  RC_POOLCHRFMT_HTML_END  (RC_POOLHTMLCHRFMT+ 30)
 
 
-// Rahmenvorlagen
+// Frame-Templates
 #define RC_POOLFRMFMT_BEGIN RC_POOLFRMFMT
 //  RC_POOLFRMFMT_END   (RC_POOLFRMFMT + 20)
 
@@ -202,27 +202,27 @@
 #define RC_POOLCOLL_HTML_END(RC_POOLTXTCOLL + 169)
 
 
-// Poolvorlagen Seite
+// Pooltemplates Page
 #define RC_POOLPAGEDESC_BEGIN   RC_POOLPAGEDESC
 //  RC_POOLPAGEDESC_END (RC_POOLPAGEDESC + 10)
 
-// Poolvorlagen Numerierung
+// Pooltemplates Numbering
 #define RC_POOLNUMRULE_BEGINRC_POOLNUMRULE
 //  RC_POOLNUMRULE_END  (RC_POOLNUMRULE + 10)
 
 // free: STR_POOLPARSTYLE to (STR_POOLPARSTYL

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

[Matthias Freund]

 sw/inc/poolfmt.hrc |   54 ++---
 1 file changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 9934695ead3908b45d0d2579ff400d795ad19c91
Author: Matthias Freund 
Date:   Sun Feb 10 13:46:38 2013 +0100

Comment translation german - english

Change-Id: I3af5ce71bb7758ae422e664ce2e0a44b8768134f
Reviewed-on: https://gerrit.libreoffice.org/2084
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index 38b522c..4d23941 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -21,10 +21,10 @@
 #include "rcid.hrc"
 
 // ---
-// die Formate
+// The Formats
 // ---
 
-// Zeichenvorlagen:
+// Drawing Templates:
 #define STR_POOLCHR_FOOTNOTE(RC_POOLCHRFMT_BEGIN+  0)
 #define STR_POOLCHR_PAGENO  (RC_POOLCHRFMT_BEGIN+  1)
 #define STR_POOLCHR_LABEL   (RC_POOLCHRFMT_BEGIN+  2)
@@ -53,7 +53,7 @@
 #define STR_POOLCHR_HTML_DEFINSTANCE(RC_POOLCHRFMT_HTML_BEGIN+  7)
 #define STR_POOLCHR_HTML_TELETYPE   (RC_POOLCHRFMT_HTML_BEGIN+  8)
 
-// Rahmen-Vorlagen:
+// Frame Templates:
 #define STR_POOLFRM_FRAME   (RC_POOLFRMFMT_BEGIN+  0)
 #define STR_POOLFRM_GRAPHIC (RC_POOLFRMFMT_BEGIN+  1)
 #define STR_POOLFRM_OLE (RC_POOLFRMFMT_BEGIN+  2)
@@ -63,9 +63,9 @@
 #define STR_POOLFRM_LABEL   (RC_POOLFRMFMT_BEGIN+  6)
 
 // ---
-// die Vorlagen
+// The Templates
 // ---
-// Gruppe Text
+// Category Text
 #define STR_POOLCOLL_STANDARD   (RC_POOLCOLL_TEXT_BEGIN+  0)
 #define STR_POOLCOLL_TEXT   (RC_POOLCOLL_TEXT_BEGIN+  1)
 #define STR_POOLCOLL_TEXT_IDENT (RC_POOLCOLL_TEXT_BEGIN+  2)
@@ -76,7 +76,7 @@
 #define STR_POOLCOLL_CONFRONTATION  (RC_POOLCOLL_TEXT_BEGIN+  7)
 #define STR_POOLCOLL_MARGINAL   (RC_POOLCOLL_TEXT_BEGIN+  8)
 
-// Untergruppierung Ueberschriften
+// Subcategory Headlines
 #define STR_POOLCOLL_HEADLINE_BASE  (RC_POOLCOLL_TEXT_BEGIN+  9)
 #define STR_POOLCOLL_HEADLINE1  (RC_POOLCOLL_TEXT_BEGIN+ 10)
 #define STR_POOLCOLL_HEADLINE2  (RC_POOLCOLL_TEXT_BEGIN+ 11)
@@ -89,9 +89,9 @@
 #define STR_POOLCOLL_HEADLINE9  (RC_POOLCOLL_TEXT_BEGIN+ 18)
 #define STR_POOLCOLL_HEADLINE10 (RC_POOLCOLL_TEXT_BEGIN+ 19)
 
-// Gruppe Listen
+// Category Lists
 #define STR_POOLCOLL_NUMBUL_BASE(RC_POOLCOLL_LISTS_BEGIN+  0)
-// Untergruppe Nummerierung
+// Subcategory Numbering
 #define STR_POOLCOLL_NUM_LEVEL1S(RC_POOLCOLL_LISTS_BEGIN+  1)
 #define STR_POOLCOLL_NUM_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+  2)
 #define STR_POOLCOLL_NUM_LEVEL1E(RC_POOLCOLL_LISTS_BEGIN+  3)
@@ -113,7 +113,7 @@
 #define STR_POOLCOLL_NUM_LEVEL5E(RC_POOLCOLL_LISTS_BEGIN+ 19)
 #define STR_POOLCOLL_NUM_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 20)
 
-// Untergruppe Aufzaehlung
+// Subcategory Enumeration
 #define STR_POOLCOLL_BUL_LEVEL1S(RC_POOLCOLL_LISTS_BEGIN+ 21)
 #define STR_POOLCOLL_BUL_LEVEL1 (RC_POOLCOLL_LISTS_BEGIN+ 22)
 #define STR_POOLCOLL_BUL_LEVEL1E(RC_POOLCOLL_LISTS_BEGIN+ 23)
@@ -135,28 +135,28 @@
 #define STR_POOLCOLL_BUL_LEVEL5E(RC_POOLCOLL_LISTS_BEGIN+ 39)
 #define STR_POOLCOLL_BUL_NONUM5 (RC_POOLCOLL_LISTS_BEGIN+ 40)
 
-// Sonderbereiche
-// Untergruppe Header
+// Special Areas
+// Subcategory Header
 #define STR_POOLCOLL_HEADER (RC_POOLCOLL_EXTRA_BEGIN+  0)
 #define STR_POOLCOLL_HEADERL(RC_POOLCOLL_EXTRA_BEGIN+  1)
 #define STR_POOLCOLL_HEADERR(RC_POOLCOLL_EXTRA_BEGIN+  2)
 
-// Untergruppe Footer
+// Subcategroy Footer
 #define STR_POOLCOLL_FOOTER (RC_POOLCOLL_EXTRA_BEGIN+  3)
 #define STR_POOLCOLL_FOOTERL(RC_POOLCOLL_EXTRA_BEGIN+  4)
 #define STR_POOLCOLL_FOOTERR(RC_POOLCOLL_EXTRA_BEGIN+  5)
 
-// Untergruppe Tabelle
+// Subcategroy Table
 #define STR_POOLCOLL_TABLE  (RC_POOLCOLL_EXTRA_BEGIN+  6)
 #define STR_POOLCOLL_TABLE_HDLN (RC_POOLCOLL_EXTRA_BEGIN+  7)
 
-// Untergruppe Labels
+// Subcategroy Labels
 #define STR_POOLCOLL_LABEL  (RC_POOLCOLL_EXTRA_BEGIN+  8)
 #define STR_POOLCOLL_LABEL_ABB  (RC_POOLCOLL_EXTRA_BEGIN+  9)
 #define STR_POOLCOLL_LABEL_TABLE(RC_POOLCOLL_EXTRA_BEGIN+ 10)
 #define STR_POOLCOLL_LABEL_FRAME(RC_POOLCOLL_EXTRA_BEGIN+ 11)
 
-// sonstiges
+// Miscellaneous
 #define STR_POOLCOLL_FRAME  (RC_POOLCOLL_EXTRA_BEGIN+ 12)
 #define STR_POOLCOLL_FOOTNOTE   (RC_POOLCOLL_EXTRA_BEGIN+ 13)
 #define STR_POOLCOLL_JAKETADRESS(RC_POOLCOLL_EXTRA_BEGIN+ 14)
@@ -165,16 +165,16 @@
 
 #define STR_POOLCOLL_LABEL_DRAWING  (RC_POOLCOLL_EXTRA_BEGIN+ 17)
 
-// Gruppe Verzeichnisse
+// Category Directories
 #define STR_POOLCOLL_REGISTER_BASE  (RC_POOLCOLL_REGISTER_BEGIN+  0)
-// Untergruppe Index-Verzeic

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

[Matthias Freund]

 sw/source/ui/table/tablepg.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e9e7e7399a71b5a5f31bd5c420e624116c6c82d
Author: Matthias Freund 
Date:   Sun Feb 10 13:06:59 2013 +0100

Comment translation german - english - correction

Change-Id: I4aec4bcf67cb2e07a4cf6d1db705438d0b94b5b7
Ooops: the width !
Reviewed-on: https://gerrit.libreoffice.org/2083
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 618f93a..e65a574 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -110,7 +110,7 @@ class SwTableColumnPage : public SfxTabPage
 SwTwips nMinWidth;
 sal_uInt16  nNoOfCols;
 sal_uInt16  nNoOfVisibleCols;
-//Remember the with, when switching to autoalign
+//Remember the width, when switching to autoalign
 sal_uInt16  aValueTbl[MET_FIELDS];//primary assignment of the 
MetricFields
 sal_BoolbModified:1;
 sal_BoolbModifyTbl:1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 sw/source/ui/table/tablepg.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 04278c1b53d93ec4c73d85b202457457d8f55cbe
Author: Matthias Freund 
Date:   Sun Feb 10 01:26:46 2013 +0100

Comment translation german - english

Hope it helps a lot.

Change-Id: If10593f81d4b2a00b8305e955ca7e6a15ed47aff
Reviewed-on: https://gerrit.libreoffice.org/2074
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index 091754d..618f93a 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -90,9 +90,9 @@ public:
 };
 
 /*---
- TabPage Format/Tabelle/Spalten
+ TabPage Format/Table/Columns
 - */
-#define MET_FIELDS 6 //Anzahl der verwendeten MetricFields
+#define MET_FIELDS 6 //Number of the used MetricFields
 
 class SwTableColumnPage : public SfxTabPage
 {
@@ -110,8 +110,8 @@ class SwTableColumnPage : public SfxTabPage
 SwTwips nMinWidth;
 sal_uInt16  nNoOfCols;
 sal_uInt16  nNoOfVisibleCols;
-//Breite merken, wenn auf autom. Ausrichtung gestellt wird
-sal_uInt16  aValueTbl[MET_FIELDS];//primaere Zuordnung der 
MetricFields
+//Remember the with, when switching to autoalign
+sal_uInt16  aValueTbl[MET_FIELDS];//primary assignment of the 
MetricFields
 sal_BoolbModified:1;
 sal_BoolbModifyTbl:1;
 sal_BoolbPercentMode:1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sw/source/ui/misc/docfnote.cxx |   16 
 sw/source/ui/misc/glosbib.cxx  |   10 +-
 sw/source/ui/misc/glosdoc.cxx  |   14 +++---
 sw/source/ui/misc/glossary.cxx |   16 
 sw/source/ui/misc/impfnote.hxx |6 +++---
 sw/source/ui/misc/insfnote.cxx |2 +-
 sw/source/ui/misc/num.cxx  |   10 +-
 sw/source/ui/misc/numberingtypelistbox.cxx |6 +++---
 sw/source/ui/misc/outline.cxx  |6 +++---
 9 files changed, 43 insertions(+), 43 deletions(-)

New commits:
commit a79b72059bf522fab1dc78383a71b2818f6866b8
Author: Takeshi Abe 
Date:   Sun Feb 10 21:13:43 2013 +0900

sal_Bool to bool

Change-Id: Iaada35250bdc7bc9393d2cfdceb8171aaafad9ee

diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 9e3bad2..70741dd 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -77,14 +77,14 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn )
 //--
 
 
-SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, sal_Bool bEN,
+SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN,
 const SfxItemSet &rSet)
 : SfxTabPage(pParent,
 bEN ? OString("EndnotePage") : OString("FootnotePage"),
 bEN ? OUString("modules/swriter/ui/endnotepage.ui") : 
OUString("modules/swriter/ui/footnotepage.ui"),
 rSet)
 , pSh(0)
-, bPosDoc(sal_False)
+, bPosDoc(false)
 , bEndNote(bEN)
 {
 get(m_pNumViewBox, "numberinglb");
@@ -131,7 +131,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
 
 if ( bEndNote )
 {
-bPosDoc = sal_True;
+bPosDoc = true;
 }
 else
 {
@@ -148,7 +148,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
 m_pPosChapterBox->Check();
 m_pNumCountBox->RemoveEntry(aNumPage);
 m_pNumCountBox->RemoveEntry(aNumChapter);
-bPosDoc = sal_True;
+bPosDoc = true;
 }
 // reference tests
 m_pContEdit->SetText(rInf.aQuoVadis);
@@ -229,7 +229,7 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage()
 
 SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet 
&rSet )
 {
-return new SwEndNoteOptionPage( pParent, sal_True, rSet );
+return new SwEndNoteOptionPage( pParent, true, rSet );
 }
 
 /*
@@ -290,7 +290,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
 IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl)
 {
 const SwFtnNum eNum = (const SwFtnNum)GetNumbering();
-bPosDoc = sal_False;
+bPosDoc = false;
 if(LISTBOX_ENTRY_NOTFOUND == m_pNumCountBox->GetEntryPos(aNumPage))
 {
 m_pNumCountBox->InsertEntry(aNumPage, FTNNUM_PAGE);
@@ -328,7 +328,7 @@ IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, 
PosChapterHdl)
 if ( !bPosDoc )
 SelectNumbering(FTNNUM_DOC);
 
-bPosDoc = sal_True;
+bPosDoc = true;
 m_pNumCountBox->RemoveEntry(aNumPage);
 m_pNumCountBox->RemoveEntry(aNumChapter);
 m_pPageTemplLbl->Enable();
@@ -410,7 +410,7 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
 }
 
 SwFootNoteOptionPage::SwFootNoteOptionPage( Window *pParent, const SfxItemSet 
&rSet ) :
-SwEndNoteOptionPage( pParent, sal_False, rSet )
+SwEndNoteOptionPage( pParent, false, rSet )
 {
 }
 
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 41ece7d..e27f84e 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -191,7 +191,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, 
EMPTYARG  )
 GlosBibUserData* pUserData = 
(GlosBibUserData*)pFirstEntry->GetUserData();
 String sEntry(pUserData->sGroupName);
 String sName(m_pNameED->GetText());
-sal_Bool bExists = sal_False;
+bool bExists = false;
 sal_uLong nPos = m_pGroupTLB->GetEntryPos(sName, 0);
 if( 0x > nPos)
 {
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl)
 OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!");
 
 // if the name to be renamed is among the new ones - replace
-sal_Bool bDone = sal_False;
+bool bDone = false;
 for (OUVector_t::iterator it(m_InsertedArr.begin());
 it != m_InsertedArr.end(); ++it)
 {
@@ -306,7 +306,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl)
 {
 m_InsertedArr.erase(it);
 m_InsertedArr.push_back(sNewName);
-bDone = sal_True;
+bDone = true;
 break;
 }
 }
@@ -342,7 +342,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
 sal_Bool bEnableDel = sal_False;
 sal_uLong nCaseReadonly =
 (sal_uLong)m_pPathLB->GetEntryDat

[Libreoffice-commits] core.git: 2 commits - setup_native/CustomTarget_scripts.mk

[David Ostrovsky]

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

New commits:
commit 5f2cfb8dc537bd99399ba3942d0f685b6db6841b
Author: David Ostrovsky 
Date:   Sun Feb 10 13:45:06 2013 +0100

Revert "replace '$<' with '$%' as it was meant here"

This reverts commit ef300e2dc3ac163cff14d659cc6e2154221c1a4e.

diff --git a/setup_native/CustomTarget_scripts.mk 
b/setup_native/CustomTarget_scripts.mk
index 10c7c0ba..f9edd90 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -26,7 +26,7 @@ $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm: 
$(SRCDIR)/setup_native/scripts/fake
chmod g+w $(scripts_WORKDIR)/fake-db-root
 
 $(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_linux.sh 
$(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
-   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $? $@
+   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
chmod 775 $@
 
 $(scripts_WORKDIR)/uninstall: $(SRCDIR)/setup_native/scripts/uninstall_linux.sh
commit a92ae7280ebb4021c576f8604ead785ee0ba219e
Author: David Ostrovsky 
Date:   Sun Feb 10 13:44:56 2013 +0100

Revert "fix fake-db-1.0-0.noarch.rpm: swap target with prerequisite"

This reverts commit ef45fe7ff055692ec43bb5d6a438fb6ec29a9004.

diff --git a/setup_native/CustomTarget_scripts.mk 
b/setup_native/CustomTarget_scripts.mk
index 71ca7b5..10c7c0ba 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -22,7 +22,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,setup_native/scripts,\
 $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm: 
$(SRCDIR)/setup_native/scripts/fake-db.spec
mkdir -p $(scripts_WORKDIR)/fake-db-root
$(RPM) --define "_builddir $(scripts_WORKDIR)/fake-db-root" \
-   --define "_rpmdir $(scripts_WORKDIR)" -bb $<
+   --define "_rpmdir $(scripts_WORKDIR)" -bb $@
chmod g+w $(scripts_WORKDIR)/fake-db-root
 
 $(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_linux.sh 
$(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/Module_setup_native.mk

[David Ostrovsky]

 setup_native/Module_setup_native.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 03b9ff533bb83ea2ea97607b7751d34206f8dcc6
Author: David Ostrovsky 
Date:   Sun Feb 10 11:51:02 2013 +0100

Module_setup_native: include Package_ulf.mk

Change-Id: I023363a81af4909f3914354b082dfc2f0315e097

diff --git a/setup_native/Module_setup_native.mk 
b/setup_native/Module_setup_native.mk
index 26cd924..889ade8 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,setup_native,\
CustomTarget_mac \
+   Package_ulf \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/Package_ulf.mk

[David Ostrovsky]

 setup_native/Package_ulf.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba811adbe9cc9e86b818b8f56f177451bf1502b9
Author: David Ostrovsky 
Date:   Sun Feb 10 11:24:51 2013 +0100

Package_ulf.mk: remove superfluous mac dir

Change-Id: Ib91eec962105fffeae9d563c18ff9192a90137c0

diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk
index 14f7b72..89842b5 100644
--- a/setup_native/Package_ulf.mk
+++ b/setup_native/Package_ulf.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call 
gb_Package_Package,setup_native/ulf,$(SRCDIR)/setup_native/source/mac))
+$(eval $(call 
gb_Package_Package,setup_native/ulf,$(SRCDIR)/setup_native/source))
 
 $(eval $(call 
gb_Package_add_file,setup_native/misc,bin/macinstall.ulf,mac/macinstall.ulf))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

[David Ostrovsky]

 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d9b5a65c8e8653a1dad3b44e29258e824f39096
Author: David Ostrovsky 
Date:   Sun Feb 10 11:04:09 2013 +0100

simplepackage.pm: be extra verbose in error case

Change-Id: I535354799d460cf5f9e1e6bcc460ecfc7c8385c8

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 09babb0..ff18bc9 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -365,7 +365,7 @@ sub create_package
 my $scripthelperref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath( 
\$scripthelpersolverfilename, $includepatharrayref, 0);
 if ($$scripthelperref eq "") { 
installer::exiter::exit_program("ERROR: Could not find Apple script 
$scripthelpersolverfilename!", "create_package"); }
 my $translationfileref = 
installer::scriptitems::get_sourcepath_from_filename_and_includepath( 
\$translationfilename, $includepatharrayref, 0);
-if ($$translationfileref eq "") { 
installer::exiter::exit_program("ERROR: Could not find Apple script translation 
file $translationfilename!", "create_package"); }
+if ($$translationfileref eq "") { 
installer::exiter::exit_program("ERROR: Could not find Apple script translation 
file $translationfilename ( includepatharrayref = $includepatharrayref )", 
"create_package"); }
 
 $scriptfilename = $contentsfolder . "/" . $scriptrealfilename;
 $scripthelperrealfilename = $contentsfolder . "/" . 
$scripthelperrealfilename;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/CustomTarget_wintools.mk

[David Ostrovsky]

 setup_native/CustomTarget_wintools.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 514d4bf561eae7f3613603e5d39721a5a9a78691
Author: David Ostrovsky 
Date:   Sun Feb 10 10:31:51 2013 +0100

wintools: fix uncomplete source file path

Change-Id: I1869dc0ac2356a0d9c18dd7958a291dcbdaf14f3

diff --git a/setup_native/CustomTarget_wintools.mk 
b/setup_native/CustomTarget_wintools.mk
index 15017d5..0436bc4 100644
--- a/setup_native/CustomTarget_wintools.mk
+++ b/setup_native/CustomTarget_wintools.mk
@@ -20,19 +20,19 @@ $(eval $(call 
gb_CustomTarget_register_targets,setup_native/wintools,\
msitran.exe \
 ))
 
-$(wintools_WORKDIR)/makecab.exe: $(wintools_SRCDIR)/makecab.c 
$(wintools_SRCDIR)/parseddf.c
+$(wintools_WORKDIR)/makecab.exe: $(wintools_SRCDIR)/makecab/makecab.c 
$(wintools_SRCDIR)/makecab/parseddf.c
$(WINEGCC) -o $@ $< -m32 -mconsole -lmsi
 
-$(wintools_WORKDIR)/msidb.exe: $(wintools_SRCDIR)/msidb.c
+$(wintools_WORKDIR)/msidb.exe: $(wintools_SRCDIR)/msidb/msidb.c
$(WINEGCC) -o $@ $< -m32 -municode -lmsi
 
-$(wintools_WORKDIR)/msiinfo.exe: $(wintools_SRCDIR)/msiinfo.c
+$(wintools_WORKDIR)/msiinfo.exe: $(wintools_SRCDIR)/msiinfo/msiinfo.c
$(WINEGCC) -o $@ $< -m32 -mconsole -municode -lmsi
 
-$(wintools_WORKDIR)/msimsp.exe: $(wintools_SRCDIR)/msimsp.c
+$(wintools_WORKDIR)/msimsp.exe: $(wintools_SRCDIR)/msimsp/msimsp.c
$(WINEGCC) -o $@ $< -m32 -mconsole -lmsi
 
-$(wintools_WORKDIR)/msitran.exe: $(wintools_SRCDIR)/msitran.c
+$(wintools_WORKDIR)/msitran.exe: $(wintools_SRCDIR)/msitran/msitran.c
$(WINEGCC) -o $@ $< -m32 -mconsole -lmsi
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/CustomTarget_scripts.mk

[David Ostrovsky]

 setup_native/CustomTarget_scripts.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef300e2dc3ac163cff14d659cc6e2154221c1a4e
Author: David Ostrovsky 
Date:   Sun Feb 10 10:14:40 2013 +0100

replace '$<' with '$%' as it was meant here

Change-Id: I760eff2a3a1cb28a1a4e47368b7919a0feacad18

diff --git a/setup_native/CustomTarget_scripts.mk 
b/setup_native/CustomTarget_scripts.mk
index 5593045..71ca7b5 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -26,7 +26,7 @@ $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm: 
$(SRCDIR)/setup_native/scripts/fake
chmod g+w $(scripts_WORKDIR)/fake-db-root
 
 $(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_linux.sh 
$(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
-   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
+   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $? $@
chmod 775 $@
 
 $(scripts_WORKDIR)/uninstall: $(SRCDIR)/setup_native/scripts/uninstall_linux.sh
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/CustomTarget_scripts.mk

[David Ostrovsky]

 setup_native/CustomTarget_scripts.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4de0eb702f004228285df8ce331c080683256e7c
Author: David Ostrovsky 
Date:   Sun Feb 10 10:04:38 2013 +0100

'$(PERL)' is missing in command line

Change-Id: I00bb54e868e777de219ecbe7ef48c250627449bb

diff --git a/setup_native/CustomTarget_scripts.mk 
b/setup_native/CustomTarget_scripts.mk
index 6d53478..5593045 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -26,7 +26,7 @@ $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm: 
$(SRCDIR)/setup_native/scripts/fake
chmod g+w $(scripts_WORKDIR)/fake-db-root
 
 $(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_linux.sh 
$(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
-   $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
+   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
chmod 775 $@
 
 $(scripts_WORKDIR)/uninstall: $(SRCDIR)/setup_native/scripts/uninstall_linux.sh
@@ -46,11 +46,11 @@ $(scripts_WORKDIR)/getuid.so.stripped: $(call 
gb_Library_get_target,getuid)
cp $< $@
/usr/ccs/bin/strip $@
 $(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_solaris.sh 
$(scripts_WORKDIR)/getuid.so.stripped
-   $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
+   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
chmod 775 $@
 
 $(scripts_WORKDIR)/uninstall: 
$(SRCDIR)/setup_native/scripts/uninstall_solaris.sh 
$(scripts_WORKDIR)/getuid.so.stripped
-   $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
+   $(PERL) -w $(SRCDIR)/setup_native/scripts/install_create.pl $< $@
chmod 775 $@
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: setup_native/CustomTarget_scripts.mk

[David Ostrovsky]

 setup_native/CustomTarget_scripts.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef45fe7ff055692ec43bb5d6a438fb6ec29a9004
Author: David Ostrovsky 
Date:   Sun Feb 10 10:00:22 2013 +0100

fix fake-db-1.0-0.noarch.rpm: swap target with prerequisite

Change-Id: I3c2940d3d6f64bcef5f9169654138170bda49d4d

diff --git a/setup_native/CustomTarget_scripts.mk 
b/setup_native/CustomTarget_scripts.mk
index f6494fa..6d53478 100644
--- a/setup_native/CustomTarget_scripts.mk
+++ b/setup_native/CustomTarget_scripts.mk
@@ -22,7 +22,7 @@ $(eval $(call 
gb_CustomTarget_register_targets,setup_native/scripts,\
 $(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm: 
$(SRCDIR)/setup_native/scripts/fake-db.spec
mkdir -p $(scripts_WORKDIR)/fake-db-root
$(RPM) --define "_builddir $(scripts_WORKDIR)/fake-db-root" \
-   --define "_rpmdir $(scripts_WORKDIR)" -bb $@
+   --define "_rpmdir $(scripts_WORKDIR)" -bb $<
chmod g+w $(scripts_WORKDIR)/fake-db-root
 
 $(scripts_WORKDIR)/install: $(SRCDIR)/setup_native/scripts/install_linux.sh 
$(scripts_WORKDIR)/fake-db-1.0-0.noarch.rpm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits