[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/XclImpChangeTrack.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd652cf5cbd4480ca8754f8faaf96f0f4455ddc0 Author: Tor Lillqvist Date: Tue Mar 26 09:05:18 2013 +0200 WaE: 'ScCellValue' defined as a struct here but previously declared as a class Change-Id: Ia848c70ce38884a6bf3f3bac81ddf8e9c479f218 diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index f1e18fb..2fceacd 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -29,7 +29,7 @@ //___ -class ScCellValue; +struct ScCellValue; class ScChangeAction; class ScChangeTrack; class XclImpChTrFmlConverter; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: make bridges work with clang on x64 linux
On 03/25/2013 07:56 PM, Peter Foley wrote: When I tried to build libreoffice with clang 3.2 for x86-64 linux I got a segfault in CustomTarget_uno_test. What Linux version would that be? After I made the above change the segfault went away. I don't really understand the bridges module so there might be a better way to fix this, but disabling optimization on that file worked for me. Yeah, disabling optimization sometimes helps to work around symptoms. The bad thing with it though is that as long as it is unclear why exactly it helped work around a problem, nobody ever dares undo that noopt change again. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - filter/Configuration_filter.mk filter/source writerperfect/source
filter/Configuration_filter.mk|5 + filter/source/config/fragments/filters/DocMaker.xcu |2 filter/source/config/fragments/filters/Mariner_Write.xcu |2 filter/source/config/fragments/filters/Nisus_Writer.xcu |2 filter/source/config/fragments/filters/TexEdit.xcu| 30 ++ filter/source/config/fragments/filters/WriterPlus.xcu | 30 ++ filter/source/config/fragments/filters/eDoc_Document.xcu |2 filter/source/config/fragments/types/writer_DocMaker.xcu |4 - filter/source/config/fragments/types/writer_LightWayText.xcu |2 filter/source/config/fragments/types/writer_Mariner_Write.xcu |2 filter/source/config/fragments/types/writer_Nisus_Writer.xcu |4 - filter/source/config/fragments/types/writer_TeachText.xcu |2 filter/source/config/fragments/types/writer_TexEdit.xcu |4 - filter/source/config/fragments/types/writer_WriterPlus.xcu|2 filter/source/config/fragments/types/writer_ZWrite.xcu|2 filter/source/config/fragments/types/writer_eDoc_Document.xcu |4 - filter/source/t602/t602filter.cxx | 27 ++--- writerperfect/source/writer/MWAWImportFilter.cxx |4 - 18 files changed, 91 insertions(+), 39 deletions(-) New commits: commit 2b28b922e11e2d45eeeba8765096d974f4908157 Author: Laurent Alonso Date: Tue Mar 26 08:43:51 2013 +0100 Some fixes for mwaw-based filters Change-Id: Ibb517b9a4690f20baa423472c001314a4d4c43f7 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 7ca392c..192a68f 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -338,7 +338,9 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter writer_MindWrite \ writer_Nisus_Writer \ writer_TeachText \ + writer_TexEdit \ writer_WriteNow \ + writer_WriterPlus \ writer_ZWrite \ writer_T602_Document \ writer_LotusWordPro_Document \ @@ -372,7 +374,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi DocMaker \ eDoc_Document \ FullWrite_Professional \ - HanMac_Word_J \ HanMac_Word_K \ LightWayText \ Mac_Word \ @@ -383,7 +384,9 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi MindWrite \ Nisus_Writer \ TeachText \ + TexEdit \ WriteNow \ + WriterPlus \ ZWrite \ T602Document \ LotusWordPro \ diff --git a/filter/source/config/fragments/filters/DocMaker.xcu b/filter/source/config/fragments/filters/DocMaker.xcu index 968abdc..9170686 100644 --- a/filter/source/config/fragments/filters/DocMaker.xcu +++ b/filter/source/config/fragments/filters/DocMaker.xcu @@ -21,7 +21,7 @@ com.sun.star.comp.Writer.MWAWImportFilter -DocMaker (v4) Document +DOCMaker (v4) Document 0 writer_DocMaker diff --git a/filter/source/config/fragments/filters/Mariner_Write.xcu b/filter/source/config/fragments/filters/Mariner_Write.xcu index 42f140e..e5a342f 100644 --- a/filter/source/config/fragments/filters/Mariner_Write.xcu +++ b/filter/source/config/fragments/filters/Mariner_Write.xcu @@ -21,7 +21,7 @@ com.sun.star.comp.Writer.MWAWImportFilter -Mariner Write v1.6 - v3.5 +Mariner Write Mac Classic v1.6 - v3.5 0 writer_Mariner_Write diff --git a/filter/source/config/fragments/filters/Nisus_Writer.xcu b/filter/source/config/fragments/filters/Nisus_Writer.xcu index 02df227..66403e5 100644 --- a/filter/source/config/fragments/filters/Nisus_Writer.xcu +++ b/filter/source/config/fragments/filters/Nisus_Writer.xcu @@ -21,7 +21,7 @@ com.sun.star.comp.Writer.MWAWImportFilter -Nisus Writer Document v3.4 - 6.5 +Nisus Writer Mac Classic v3.4 - 6.5 0 writer_Nisus_Writer diff --git a/filter/source/config/fragments/filters/TexEdit.xcu b/filter/source/config/fragments/filters/TexEdit.xcu index 36b353d..d505f85 100644 --- a/filter/source/config/fragments/filters/TexEdit.xcu +++ b/filter/source/config/fragments/filters/TexEdit.xcu @@ -21,6 +21,36 @@ com.sun.star.comp.Writer.MWAWImportFilter +TexEdit v2 Document + +0 +writer_TexEdit + +com.sun.star.text.TextDocument + + + +IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED + +com.sun.star.comp.Writer.MWAWImportFilter + + Tex-Edit v2 Document 0 diff --git a/filter/source/config/fragments/filters/WriterPlus.xcu b/filter/source/config/fragments/filters/Write
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/inc sfx2/source
sfx2/inc/sfx2/thumbnailview.hxx |1 +
sfx2/source/control/thumbnailview.cxx | 31 +--
sfx2/source/doc/templatedlg.cxx |2 +-
3 files changed, 31 insertions(+), 3 deletions(-)
New commits:
commit 369cb8e216f9287234d601f4b28e0332a2ec29a5
Author: Cédric Bosdonnat
Date: Mon Mar 25 16:40:37 2013 +0100
fdo#61390: allow arrow keys to show hidden thumbnail items
Change-Id: I70924b4c9578122a1c5a5b6c8a67889d6d003a2e
(cherry picked from commit cc599e914e7ade9f10da460fc1c77ea07454d7ff)
Reviewed-on: https://gerrit.libreoffice.org/3033
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 95e6b53..9e29c9a 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -277,6 +277,7 @@ protected:
using Window::ImplInit;
void CalculateItemPositions ();
+void MakeItemVisible( sal_uInt16 nId );
SFX2_DLLPRIVATE void ImplInit();
SFX2_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index f78a308..08be7cb 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -553,13 +553,40 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt )
Control::KeyInput( rKEvt );
}
-if ( pNext && pNext->isVisible() )
+if ( pNext )
{
deselectItems();
SelectItem(pNext->mnId);
+MakeItemVisible(pNext->mnId);
}
}
+void ThumbnailView::MakeItemVisible( sal_uInt16 nItemId )
+{
+// Get the item row
+size_t nPos = 0;
+bool bFound = false;
+for ( size_t i = 0; !bFound && i < mFilteredItemList.size(); ++i )
+{
+ThumbnailViewItem* pItem = mFilteredItemList[i];
+if ( pItem->mnId == nItemId )
+{
+nPos = i;
+bFound = true;
+}
+}
+sal_uInt16 nRow = nPos / mnCols;
+
+// Move the visible rows as little as possible to include that one
+if ( nRow < mnFirstLine )
+mnFirstLine = nRow;
+else if ( nRow > mnFirstLine + mnVisLines )
+mnFirstLine = nRow - mnVisLines;
+
+CalculateItemPositions();
+Invalidate();
+}
+
void ThumbnailView::MouseButtonDown( const MouseEvent& rMEvt )
{
if ( rMEvt.IsLeft() )
@@ -703,11 +730,11 @@ void ThumbnailView::LoseFocus()
void ThumbnailView::Resize()
{
+Control::Resize();
CalculateItemPositions();
if ( IsReallyVisible() && IsUpdateMode() )
Invalidate();
-Control::Resize();
}
void ThumbnailView::StateChanged( StateChangedType nType )
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b9d3945..e5e4014 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -331,7 +331,7 @@ void SfxTemplateManagerDlg::Resize()
Point aViewPos = maView->GetPosPixel();
aViewPos.setY(nToolbarsHeight);
aViewPos.setX(0);
-Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getWidth() - aViewPos.getY());
+Size aThumbSize(aWinSize.getWidth(),
maTabControl.GetTabPageSizePixel().getHeight() - aViewPos.getY());
maView->SetPosSizePixel(aViewPos, aThumbSize);
if (aWinSize.getHeight() < aViewPos.getY() + aThumbSize.getHeight() +
PADDING_DLG_BORDER)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#61390: allow arrow keys to show hidden thumbnail items
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3033 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3033 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70924b4c9578122a1c5a5b6c8a67889d6d003a2e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric Gerrit-Reviewer: Miklos Vajna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/control/thumbnailview.cxx | 22 +-
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit edc8b07e5f69413b3710ddf192a84a862b0e17af
Author: Cédric Bosdonnat
Date: Mon Mar 25 17:58:49 2013 +0100
fdo#62659: only select items in ThumbnailView on TabStop
Change-Id: I024df8520f0daf2cc2e9e5f041e1ff18cb3689ec
(cherry picked from commit f8a3582d4cbcf6a705f724b921e370c739ecee35)
Reviewed-on: https://gerrit.libreoffice.org/3034
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 08be7cb..0da633f 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -126,6 +126,7 @@ void ThumbnailView::ImplDeleteItems()
}
mItemList.clear();
+mFilteredItemList.clear();
}
void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool
bBackground )
@@ -680,17 +681,20 @@ void ThumbnailView::Paint( const Rectangle &aRect)
void ThumbnailView::GetFocus()
{
-// Select the first item if nothing selected
-int nSelected = -1;
-for (size_t i = 0, n = mItemList.size(); i < n && nSelected == -1; ++i)
+if(GETFOCUS_TAB & GetGetFocusFlags())
{
-if (mItemList[i]->isSelected())
-nSelected = i;
-}
+// Select the first item if nothing selected
+int nSelected = -1;
+for (size_t i = 0, n = mItemList.size(); i < n && nSelected == -1; ++i)
+{
+if (mItemList[i]->isSelected())
+nSelected = i;
+}
-if ( nSelected == -1 && mItemList.size( ) > 0 )
-{
-SelectItem( 1 );
+if ( nSelected == -1 && mItemList.size( ) > 0 )
+{
+SelectItem( 1 );
+}
}
// Tell the accessible object that we got the focus.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#62659: only select items in ThumbnailView on TabStop
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3034 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3034 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I024df8520f0daf2cc2e9e5f041e1ff18cb3689ec Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric Gerrit-Reviewer: Miklos Vajna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 6f9b1eb8611ad706725388b15038a6673143fe34
Author: Eike Rathke
Date: Mon Mar 25 21:21:41 2013 +0100
resolved fdo#44286 some historical dates were decremented
Depending on historical timezone data with odd offsets some historical
dates were decremented by one day due to a rounding error.
Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d
(cherry picked from commit 6013fe19a40dd16ce435a2428f7405b51930689e)
Reviewed-on: https://gerrit.libreoffice.org/3036
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx
b/i18npool/source/calendar/calendar_gregorian.cxx
index a2a5324..e01abaf 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
@@ -283,8 +284,19 @@ Calendar_gregorian::getUniqueID() throw(RuntimeException)
void SAL_CALL
Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException)
{
+// ICU handles dates in milliseconds as double values and uses floor()
+// to obtain integer values, which may yield a date decremented by one
+// for odd (historical) timezone values where the computed value due to
+// rounding errors has a fractional part in milliseconds. Ensure we
+// pass a value without fraction here. If not, that may lead to
+// fdo#44286 or fdo#52619 and the like, e.g. when passing
+// -2136315212000.000244 instead of -2136315212000.00
+double fM = timeInDays * U_MILLIS_PER_DAY;
+double fR = rtl::math::round( fM );
+SAL_INFO_IF( fM != fR, "i18npool",
+"Calendar_gregorian::setDateTime: " << std::fixed << fM << "
rounded to " << fR);
UErrorCode status;
-body->setTime(timeInDays * U_MILLIS_PER_DAY, status = U_ZERO_ERROR);
+body->setTime( fR, status = U_ZERO_ERROR);
if ( !U_SUCCESS(status) ) throw ERROR;
getValue();
}
@@ -679,6 +691,11 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
DUMP_ICU_CAL_MSG(("%s\n","setValue() after Zone/DST glitch
2nd resubmit"));
DUMP_I18N_CAL_MSG(("%s\n","setValue() after Zone/DST
glitch 2nd resubmit"));
}
+SAL_INFO( "i18npool", "Calendar_gregorian::setValue:" <<
+" nZone0 " << nZone0 << ", nDST0 " << nDST0 <<
+", nZone1 " << nZone1 << ", nDST1 " << nDST1 <<
+", nZone2 " << nZone2 << ", nDST2 " << nDST2 <<
+", nZone3 " << nZone3 << ", nDST3 " << nDST3);
}
}
#if erDUMP_ICU_CALENDAR || erDUMP_I18N_CALENDAR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] resolved fdo#44286 some historical dates were decremented
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3036 Approvals: Thorsten Behrens: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3036 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke Gerrit-Reviewer: Thorsten Behrens ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/table/splittbl.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 64a3b58a9ace11c6a01708e8de14712e27e02043 Author: Joren De Cuyper Date: Mon Mar 25 22:11:59 2013 +0100 fix fdo#62670 - TABLE: Splitting a table options are mixed Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Reviewed-on: https://gerrit.libreoffice.org/3042 Reviewed-by: Petr Mladek Tested-by: Petr Mladek diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..d85bb95 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) get(mpCntntCopyRB, "copyheading"); get(mpBoxAttrCopyWithParaRB, "customheadingapplystyle"); get(mpBoxAttrCopyNoParaRB, "customheading"); -get(mpBorderCopyRB, "customheading"); +get(mpBorderCopyRB, "noheading"); } void SwSplitTblDlg::Apply() @@ -38,7 +38,7 @@ void SwSplitTblDlg::Apply() m_nSplit = HEADLINE_CNTNTCOPY; if(mpBoxAttrCopyWithParaRB->IsChecked()) m_nSplit = HEADLINE_BOXATRCOLLCOPY; -if(mpBoxAttrCopyNoParaRB->IsChecked()) +else if(mpBoxAttrCopyNoParaRB->IsChecked()) m_nSplit = HEADLINE_BOXATTRCOPY; else if(mpBorderCopyRB->IsChecked()) m_nSplit = HEADLINE_BORDERCOPY; @@ -46,6 +46,4 @@ void SwSplitTblDlg::Apply() rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 7d7c4aa9f07e309e9185bab77a197b3dbe1f2dd1
Author: Eike Rathke
Date: Mon Mar 25 21:21:41 2013 +0100
resolved fdo#44286 some historical dates were decremented
Depending on historical timezone data with odd offsets some historical
dates were decremented by one day due to a rounding error.
Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d
(cherry picked from commit 6013fe19a40dd16ce435a2428f7405b51930689e)
Reviewed-on: https://gerrit.libreoffice.org/3037
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx
b/i18npool/source/calendar/calendar_gregorian.cxx
index a2a5324..e01abaf 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
@@ -283,8 +284,19 @@ Calendar_gregorian::getUniqueID() throw(RuntimeException)
void SAL_CALL
Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException)
{
+// ICU handles dates in milliseconds as double values and uses floor()
+// to obtain integer values, which may yield a date decremented by one
+// for odd (historical) timezone values where the computed value due to
+// rounding errors has a fractional part in milliseconds. Ensure we
+// pass a value without fraction here. If not, that may lead to
+// fdo#44286 or fdo#52619 and the like, e.g. when passing
+// -2136315212000.000244 instead of -2136315212000.00
+double fM = timeInDays * U_MILLIS_PER_DAY;
+double fR = rtl::math::round( fM );
+SAL_INFO_IF( fM != fR, "i18npool",
+"Calendar_gregorian::setDateTime: " << std::fixed << fM << "
rounded to " << fR);
UErrorCode status;
-body->setTime(timeInDays * U_MILLIS_PER_DAY, status = U_ZERO_ERROR);
+body->setTime( fR, status = U_ZERO_ERROR);
if ( !U_SUCCESS(status) ) throw ERROR;
getValue();
}
@@ -679,6 +691,11 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
DUMP_ICU_CAL_MSG(("%s\n","setValue() after Zone/DST glitch
2nd resubmit"));
DUMP_I18N_CAL_MSG(("%s\n","setValue() after Zone/DST
glitch 2nd resubmit"));
}
+SAL_INFO( "i18npool", "Calendar_gregorian::setValue:" <<
+" nZone0 " << nZone0 << ", nDST0 " << nDST0 <<
+", nZone1 " << nZone1 << ", nDST1 " << nDST1 <<
+", nZone2 " << nZone2 << ", nDST2 " << nDST2 <<
+", nZone3 " << nZone3 << ", nDST3 " << nDST3);
}
}
#if erDUMP_ICU_CALENDAR || erDUMP_I18N_CALENDAR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/table/splittbl.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit b23214f768e94f3fbdb0317b5fd458c55a9118db Author: Joren De Cuyper Date: Mon Mar 25 22:11:59 2013 +0100 fix fdo#62670 - TABLE: Splitting a table options are mixed Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Reviewed-on: https://gerrit.libreoffice.org/3041 Reviewed-by: Petr Mladek Tested-by: Petr Mladek diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..d85bb95 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) get(mpCntntCopyRB, "copyheading"); get(mpBoxAttrCopyWithParaRB, "customheadingapplystyle"); get(mpBoxAttrCopyNoParaRB, "customheading"); -get(mpBorderCopyRB, "customheading"); +get(mpBorderCopyRB, "noheading"); } void SwSplitTblDlg::Apply() @@ -38,7 +38,7 @@ void SwSplitTblDlg::Apply() m_nSplit = HEADLINE_CNTNTCOPY; if(mpBoxAttrCopyWithParaRB->IsChecked()) m_nSplit = HEADLINE_BOXATRCOLLCOPY; -if(mpBoxAttrCopyNoParaRB->IsChecked()) +else if(mpBoxAttrCopyNoParaRB->IsChecked()) m_nSplit = HEADLINE_BOXATTRCOPY; else if(mpBorderCopyRB->IsChecked()) m_nSplit = HEADLINE_BORDERCOPY; @@ -46,6 +46,4 @@ void SwSplitTblDlg::Apply() rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fix fdo#62670 - TABLE: Splitting a table options are mixed
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3042 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3042 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0-2] resolved fdo#44286 some historical dates were decremented
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3037 Approvals: Markus Mohrhard: Verified; Looks good to me, approved Petr Mladek: Verified; Looks good to me, but someone else must approve Thorsten Behrens: Verified; Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3037 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-2 Gerrit-Owner: Eike Rathke Gerrit-Reviewer: Markus Mohrhard Gerrit-Reviewer: Petr Mladek Gerrit-Reviewer: Thorsten Behrens ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix fdo#62670 - TABLE: Splitting a table options are mixed
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3041 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3041 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - sw/source
sw/source/ui/table/splittbl.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit aa85ff19b4acaf98adfaa8787afce5698e7b085e Author: Joren De Cuyper Date: Mon Mar 25 22:11:59 2013 +0100 fix fdo#62670 - TABLE: Splitting a table options are mixed Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Reviewed-on: https://gerrit.libreoffice.org/3043 Reviewed-by: Petr Mladek Tested-by: Petr Mladek Reviewed-by: Fridrich Strba Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index f82d642..d85bb95 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -30,7 +30,7 @@ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) get(mpCntntCopyRB, "copyheading"); get(mpBoxAttrCopyWithParaRB, "customheadingapplystyle"); get(mpBoxAttrCopyNoParaRB, "customheading"); -get(mpBorderCopyRB, "customheading"); +get(mpBorderCopyRB, "noheading"); } void SwSplitTblDlg::Apply() @@ -38,7 +38,7 @@ void SwSplitTblDlg::Apply() m_nSplit = HEADLINE_CNTNTCOPY; if(mpBoxAttrCopyWithParaRB->IsChecked()) m_nSplit = HEADLINE_BOXATRCOLLCOPY; -if(mpBoxAttrCopyNoParaRB->IsChecked()) +else if(mpBoxAttrCopyNoParaRB->IsChecked()) m_nSplit = HEADLINE_BOXATTRCOPY; else if(mpBorderCopyRB->IsChecked()) m_nSplit = HEADLINE_BORDERCOPY; @@ -46,6 +46,4 @@ void SwSplitTblDlg::Apply() rShell.SplitTable(m_nSplit); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0-2] fix fdo#62670 - TABLE: Splitting a table options are mixed
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3043 Approvals: Petr Mladek: Verified; Looks good to me, but someone else must approve Michael Meeks: Verified; Looks good to me, approved Fridrich Strba: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3043 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ba647844aaae3a57ee91d5785c82ca082d3e10b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-2 Gerrit-Owner: Joren De Cuyper Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: Michael Meeks Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 9dfdb7955c1f5781340dc688cc0229dea9cb4c2d
Author: Eike Rathke
Date: Mon Mar 25 21:21:41 2013 +0100
resolved fdo#44286 some historical dates were decremented
Depending on historical timezone data with odd offsets some historical
dates were decremented by one day due to a rounding error.
Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d
(cherry picked from commit 6013fe19a40dd16ce435a2428f7405b51930689e)
Reviewed-on: https://gerrit.libreoffice.org/3039
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx
b/i18npool/source/calendar/calendar_gregorian.cxx
index e76c431..fc7dcf6 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
@@ -292,8 +293,19 @@ Calendar_gregorian::getUniqueID() throw(RuntimeException)
void SAL_CALL
Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException)
{
+// ICU handles dates in milliseconds as double values and uses floor()
+// to obtain integer values, which may yield a date decremented by one
+// for odd (historical) timezone values where the computed value due to
+// rounding errors has a fractional part in milliseconds. Ensure we
+// pass a value without fraction here. If not, that may lead to
+// fdo#44286 or fdo#52619 and the like, e.g. when passing
+// -2136315212000.000244 instead of -2136315212000.00
+double fM = timeInDays * U_MILLIS_PER_DAY;
+double fR = rtl::math::round( fM );
+SAL_INFO_IF( fM != fR, "i18npool",
+"Calendar_gregorian::setDateTime: " << std::fixed << fM << "
rounded to " << fR);
UErrorCode status;
-body->setTime(timeInDays * U_MILLIS_PER_DAY, status = U_ZERO_ERROR);
+body->setTime( fR, status = U_ZERO_ERROR);
if ( !U_SUCCESS(status) ) throw ERROR;
getValue();
}
@@ -688,6 +700,11 @@ void Calendar_gregorian::setValue() throw(RuntimeException)
DUMP_ICU_CAL_MSG(("%s\n","setValue() after Zone/DST glitch
2nd resubmit"));
DUMP_I18N_CAL_MSG(("%s\n","setValue() after Zone/DST
glitch 2nd resubmit"));
}
+SAL_INFO( "i18npool", "Calendar_gregorian::setValue:" <<
+" nZone0 " << nZone0 << ", nDST0 " << nDST0 <<
+", nZone1 " << nZone1 << ", nDST1 " << nDST1 <<
+", nZone2 " << nZone2 << ", nDST2 " << nDST2 <<
+", nZone3 " << nZone3 << ", nDST3 " << nDST3);
}
}
#if erDUMP_ICU_CALENDAR || erDUMP_I18N_CALENDAR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-3-6] resolved fdo#44286 some historical dates were decremented
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3039 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3039 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3216b1c043fe5ab9035a558031f1a58efa0c3b3d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx | 29 +
1 file changed, 29 insertions(+)
New commits:
commit 80996c374b4ff2514b2e952cfd572ae499b481a1
Author: Markus Mohrhard
Date: Mon Mar 25 14:51:27 2013 +0100
add inital test case for fdo#62206
Change-Id: I0a88f4cbd70f5acf84b9c1c6704ac0be92b79c5b
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index f72bdd0..ec07695 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -68,6 +68,8 @@
#include "interpre.hxx"
#include "columniterator.hxx"
#include "types.hxx"
+#include "conditio.hxx"
+#include "globstr.hrc"
#include "formula/IFunctionDescription.hxx"
@@ -272,6 +274,7 @@ public:
* Test formula & formula grouping
*/
void testFormulaGrouping();
+void testCondFormatINSDEL();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testCollator);
@@ -336,6 +339,7 @@ public:
CPPUNIT_TEST(testAnchoredRotatedShape);
CPPUNIT_TEST(testCellTextWidth);
CPPUNIT_TEST(testFormulaGrouping);
+CPPUNIT_TEST(testCondFormatINSDEL);
CPPUNIT_TEST_SUITE_END();
private:
@@ -6274,6 +6278,31 @@ void Test::testFormulaGrouping()
}
}
+void Test::testCondFormatINSDEL()
+{
+// fdo#62206
+m_pDoc->InsertTab(0, "Test");
+ScConditionalFormatList* pList = m_pDoc->GetCondFormList(0);
+
+ScConditionalFormat* pFormat = new ScConditionalFormat(1, m_pDoc);
+ScRangeList aRangeList(ScRange(0,0,0,0,3,0));
+pFormat->AddRange(aRangeList);
+ScCondFormatEntry* pEntry = new
ScCondFormatEntry(SC_COND_DIRECT,"=B2","",m_pDoc,ScAddress(0,0,0),ScGlobal::GetRscString(STR_STYLENAME_RESULT));
+pFormat->AddEntry(pEntry);
+
+m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, 1);
+pList->InsertNew(pFormat);
+
+m_pDoc->InsertCol(0,0,MAXROW,0,0,2);
+const ScRangeList& rRange = pFormat->GetRange();
+CPPUNIT_ASSERT(rRange == ScRange(2,0,0,2,3,0));
+
+OUString aExpr = pEntry->GetExpression(ScAddress(2,0,0), 0);
+CPPUNIT_ASSERT_EQUAL(aExpr, OUString("D2"));
+
+m_pDoc->DeleteTab(0);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRContentCollector.h |8
src/lib/CDRParser.cpp |5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 4144e6e95a6ff2a73b5c94af87eb51a25c56e103
Author: Fridrich Å trba
Date: Tue Mar 26 09:02:55 2013 +0100
Some cosmetical fixes
diff --git a/src/lib/CDRContentCollector.h b/src/lib/CDRContentCollector.h
index ba0cd28..0f8019c 100644
--- a/src/lib/CDRContentCollector.h
+++ b/src/lib/CDRContentCollector.h
@@ -73,8 +73,8 @@ public:
void collectPageSize(double, double, double, double) {}
void collectPolygonTransform(unsigned numAngles, unsigned nextPoint, double
rx, double ry, double cx, double cy);
void collectBitmap(unsigned imageId, double x1, double x2, double y1, double
y2);
- void collectBmp(unsigned, unsigned, unsigned, unsigned, unsigned, const
std::vector&, const std::vector&) {}
- void collectBmp(unsigned, const std::vector&) {}
+ void collectBmp(unsigned, unsigned, unsigned, unsigned, unsigned, const
std::vector &, const std::vector &) {}
+ void collectBmp(unsigned, const std::vector &) {}
void collectBmpf(unsigned, unsigned, unsigned, const std::vector &) {}
void collectPpdt(const std::vector > &points,
const std::vector &knotVector);
void collectFillTransform(const CDRTransforms &fillTrafo);
@@ -87,8 +87,8 @@ public:
void collectVectorPattern(unsigned id, const WPXBinaryData &data);
void collectPaletteEntry(unsigned, unsigned, const CDRColor &) {}
void collectFont(unsigned, unsigned short, const WPXString &) {}
- void collectText(unsigned, unsigned, const std::vector&,
- const std::vector&, const std::map&) {}
+ void collectText(unsigned, unsigned, const std::vector &,
+ const std::vector &, const std::map &) {}
void collectArtisticText(double x, double y);
void collectParagraphText(double x, double y, double width, double height);
void collectStlt(const std::map &) {}
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 52cea0b..6cc31de 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -115,7 +115,7 @@ static void processNameForEncoding(WPXString &name,
unsigned short &encoding)
else if (length >= 4 && (found=fontName.find("GOST", 0, 4)) !=
std::string::npos)
{
encoding = 0xcc;
- found = std::string::npos;
+found = std::string::npos;
}
if (found != std::string::npos)
@@ -2386,7 +2386,8 @@ void libcdr::CDRParser::readFont(WPXInputStream *input,
unsigned length)
break;
}
}
- processNameForEncoding(name, fontEncoding);
+ if (!fontEncoding)
+processNameForEncoding(name, fontEncoding);
m_collector->collectFont(fontId, fontEncoding, name);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source svl/inc
sfx2/source/dialog/templdlg.cxx | 54
sfx2/source/inc/templdgi.hxx|2 +
svl/inc/svl/style.hrc |1
3 files changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 44dd8b838b8dfa74b895a870a68200cf4f3574e0
Author: Michael Stahl
Date: Tue Mar 26 11:33:09 2013 +0100
fdo#61429: Stylist: save selection of "Hierarchical" entry
This is unfortunately rather ugly because that one is "very special".
Change-Id: Ie2bc9ce2690fbc742b4510e453ca1ef310614256
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d6d1af3..1b98850 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -744,6 +744,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(
SfxBindings* pB, Sfx
bUpdateByExampleDisabled( sal_False ),
bTreeDrag ( sal_True ),
bHierarchical ( sal_False ),
+m_bWantHierarchical ( sal_False ),
bBindingUpdate ( sal_True )
{
aFmtLb.SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString());
@@ -1232,8 +1233,10 @@ void
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
}
// if the tree view again, select family hierarchy
-if(pTreeBox)
+if (pTreeBox || m_bWantHierarchical)
+{
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
+}
// show maximum 14 entries
aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
@@ -1241,12 +1244,21 @@ void
SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
}
else
{
-if( nActFilter < aFilterLb.GetEntryCount() - 1)
-aFilterLb.SelectEntryPos(nActFilter + 1);
-else
+if (m_bWantHierarchical)
{
nActFilter = 0;
-aFilterLb.SelectEntryPos(1);
+aFilterLb.SelectEntry(SfxResId(
+STR_STYLE_FILTER_HIERARCHICAL).toString());
+}
+else
+{
+if (nActFilter < aFilterLb.GetEntryCount() - 1)
+aFilterLb.SelectEntryPos(nActFilter + 1);
+else
+{
+nActFilter = 0;
+aFilterLb.SelectEntryPos(1);
+}
}
}
@@ -1590,7 +1602,6 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster&
/*rBC*/, const SfxHint
//-
-
// Other filters; can be switched by the users or as a result of new or
// editing, if the current document has been assigned a different filter.
void SfxCommonTemplateDialog_Impl::FilterSelect(
@@ -1601,14 +1612,7 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
if( nEntry != nActFilter || bForce )
{
nActFilter = nEntry;
-SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
-SfxObjectShell *pDocShell = pViewFrame->GetObjectShell();
-if (pDocShell)
-{
-pDocShell->SetAutoStyleFilterIndex(nActFilter);
-SaveFactoryStyleFilter( pDocShell, nActFilter );
-}
-
+SfxObjectShell *const pDocShell = SaveSelection();
SfxStyleSheetBasePool *pOldStyleSheetPool = pStyleSheetPool;
pStyleSheetPool = pDocShell? pDocShell->GetStyleSheetPool(): 0;
if ( pOldStyleSheetPool != pStyleSheetPool )
@@ -1700,6 +1704,8 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl,
ListBox *, pBox )
{
// Turn on treeView
bHierarchical=sal_True;
+m_bWantHierarchical = sal_True;
+SaveSelection(); // fdo#61429 store "hierarchical"
const String aSelectEntry( GetSelectedEntry());
aFmtLb.Hide();
@@ -1732,6 +1738,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl,
ListBox *, pBox )
aFmtLb.Show();
// If bHierarchical, then the family can have changed
// minus one since hierarchical is inserted at the start
+m_bWantHierarchical = sal_False; // before FilterSelect
FilterSelect(pBox->GetSelectEntryPos() - 1, bHierarchical );
bHierarchical=sal_False;
}
@@ -1874,6 +1881,10 @@ sal_Int32
SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell*
sal_Int32 nDefault = -1;
nFilter = aFactoryProps.getUnpackedValueOrDefault(
"ooSetupFactoryStyleFilter", nDefault );
+m_bWantHierarchical =
+(nFilter & SFXSTYLEBIT_HIERARCHY) ? sal_True : sal_False;
+nFilter &= ~SFXSTYLEBIT_HIERARCHY; // clear it
+
return nFilter;
}
@@ -1884,10 +1895,23 @@ void
SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pOb
OSL_ENSURE( i_pObjSh,
"SfxCommonTemplateDialog_Impl::LoadFactoryStyleFil
Re: [PATCH] fdo#51296:UI: Calc doesn't take care of security setting "Ctrl-click required to follow hyperlinks
Ooops sorry for that Kohei. I'll keep that in mind always. On Mon, Mar 25, 2013 at 5:56 PM, Akash Shetye wrote: > > Hey, > > > > Petr thank you for your suggestions, I happened to overlook the > "Ctrl-click > > to open hyperlink" prefix string to the tooltips in excitement oh having > a > > patch :P. Now that I have taken a look at sc/ code, I find that the > prefixed > > string is not hardcoded into the sw/ code. Also how sc/ and sw/ handle > > hyperlinks is very differently. I tried probing into the vcl part about > > fixedhyperlink.cxx to trace things back up from there but things aren't > > working well. Just knowing which part of code is doing the tooltip > content > > setting in sc/ will be cool enough. Thanks for cc'ing the experts. > > > > And kohei thank you as well, I will take care of the issues you have > pointed > > about in the other thread. Till then I am combing the code. > > > > Akash. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[License] License statement for Libreoffice
All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.0.2.2'
Tag 'libreoffice-4.0.2.2' created by Petr Mladek at 2013-03-26 12:02 -0700 Tag libreoffice-4.0.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUYBTAAoJEPQ0oe+v7q6j8/AP/jfTExh//xtJofV7TQquHP68 c5/gqXkxetN27lp+jAhsxrcO42h/vY1PneNfEhglkB9NMgKGva+ZSughRvXEGG1L K3hLj409yp+cVE3PDD4ZSk7WDmmCWvCruwlQSWxBxb/wZ0UwSIoseoLVCf5BFNRa SZCeTs2XD4Z19Qe1bT2XuuQw3KhFHV817eoDpmY9jxLD4eaP8zrlO42aRF+TQIfI SzdAtt1jgC/fVLWipyQox3u8+2lfe3f7dE7Y/7934eTztX8qV1LYelJEmLwZGCJq XHU/bRUjB3g0bLYgGlKZv5uKPWEv3llN96Zl3fNq64K0uTXWmCPFFCOKBXPfjtBD h/HXHNNUDS5+SZ+Db/atihOZq8nJJChwuYcBgjggE2iCOh57jq+dWezgBxTaCTMm EwwOoOD/XNEAwD7Q2yON/rNK6rzwryEcXVxgNYrOXPy4bA6papAIy3NreXL5kfxF A8Hva10gTMB2yNaCkHuE6lQpzrZU4y0CudXTUQCu6qoXTvSH/cm/+2GKkivsQiIw aMEGe6L4aHQbFaczq9DNkU+DacGqesQM3OsJFL8cMgXCQSqH13IzZ8K0ZRFtSFUA XOmzU19L/5ZNYTRiDclc+N3lJ0+yjTKfS55+w6JrDbjoVje/YlRnOWNOKSrPaPOo rs0bof9H7JfHkapDUNat =SPiY -END PGP SIGNATURE- Changes since sdremote-1.0.2-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.0.2.2'
Tag 'libreoffice-4.0.2.2' created by Petr Mladek at 2013-03-26 12:02 -0700 Tag libreoffice-4.0.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUYBTAAoJEPQ0oe+v7q6jJYIP/jyu5cNAr2Qhi36fnMsG8jET Tqdxltz7QyIdQ5ypWPs52Q0OVYTuyI0WDuDYKX37+1/csWrHWVESosjkrp2+ywgx MhTGxW0DLp4A+ZDsUZfr9dXP8fG9FhNIV5BLwLFGq685I1YSSTKoa0PMpXBLKDL5 kCIE8mRBqK7kyqkEMjJ1LZ0NqwR9dMahf9ul37M7nC2cTV4ClDlICpcSHQSgdeQi mrQrWMfir8PVVfQIiWO03CIhcHsiW2mBT6IAQAzrhrfcgJbZGA2NChR47MOzDR8K /bPBQifYy7E404yowZ08suX1nMvJtlO7Rx92EH/6kFaP7NdEtWKYoIeVJtLflLyQ 2stnC64gNBVtchjVXykZrf5pL1OIsSMrSTp1Tce/X5Fu52UUqvHTJYWxOVkbfAfT FCcn90Vq2DIDws6nU1usf4QTrH3X6I6SRpG7B6qta94x5u/iGyBBdjONJZAAI6as /AgHArLXSFi+sWdtQ9sRK2J44VJB/zZbO9h+dSGQt8RvR1gqRTfTx7iKikvq564e l74pAHTV2lYt8I+k1YSIys2cIHlvnMisl0wo8gai8JOTVDvaUmKafZsgf2OGBgpy mCgGXQ7MLZGZQDIxglwadAtctBxqvM2avugg+Aj+uDFYYYHyJ1MoJnBaK/3FGmlU pPA7KZXHZK1h7HU0ngPu =rmbx -END PGP SIGNATURE- Changes since sdremote-1.0.2-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.0.2.2'
Tag 'libreoffice-4.0.2.2' created by Petr Mladek at 2013-03-26 12:02 -0700 Tag libreoffice-4.0.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUYBTAAoJEPQ0oe+v7q6jntoQALFMHcFKFMD/Ya7bHLG3frcm am4gQBz+Wve4RB4ocs40rri1axIwcijcXWh6BbBvKw3qFYRgngrNAs/q5MjIRQlD +FPDW4l5Kqy8aOHphEwn9qkYURi4PW6Sv+IHntxeM2E27PRk2QCyWMHlv+4FEizI u8pyeUGmq/nGRZ05NG+4gmdRVQnw+bvJ6QlXwK/tLsTl12COVuwKxXYX6q3TKLdZ y4CqQzTrTxH2Sgu67wXnh68MkYA8QsjU26KPvn7653JEosZGXIvJ7LpqI6OqQjkH tmTyY3D7B6C7fvQ4Flm0zsAaYLcGSBEuozU6m7llnYTh7gdoao6HMgNBbX9bduIi uEdn64bF+fsjxafs6/qYLx7xovVd0ADuxkhUcQ584TRkIYBOkTB3DcEOlLk0o5mq Yg3ILBV9P4vNI4DbCHhbSNkOHJlTQauMubzDJhxRm7wxkDsL8SmMGqshOyx9ECjk f50uOCYXrWWg2PSnMf/SzZHRh7pFMBbwXLS1jkcv3Ls7MLBMzMFyz49H6VKBKvMP jFPXjlx9FYeplkJHKsf/idFNaX7qNaz2GYTmydEGCGKg51rBedN3sottoan0jsqU iooDoF/RM9osPhztvd3Z6x+vjEkBCrw9iwjvxxH4DWGyqvG1UuxdcE4BiZtMUXWN HoYrcrEdciS2A8LIBWhp =X3+A -END PGP SIGNATURE- Changes since sdremote-1.0.2-6: --- 0 files changed --- ___ 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.0.2.2'
Tag 'libreoffice-4.0.2.2' created by Petr Mladek at 2013-03-26 12:02 -0700 Tag libreoffice-4.0.2.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRUYBTAAoJEPQ0oe+v7q6j5Q0QALT6U49eSZXVhhMu6JSF1RPx G8hj2GY5cb5TNZcVnFinoYxboX+Tu21iCdlQXeXvt01cUirTeKYFQ/LQO8nby6+P wjvVkbnk3MvtyIB0c400h2XGwVGJZGIaZlAYjJVD56b6K44CDjyGU802hnfpkWR4 ivLxt3AUETbcBHXVu/9j0jRH9grATDJsxyOlC2nHGtDn7FHuKPbjCsbBXNEN0XyL hPc76G9mdxuJNW/U6vR/yZqpyNUhujJK26EFyGRJVMUvfTYmM4W/qGlvxpESvXJi QCRWU1cG30XlK8rR1BD2E9PXKxXDA/dEIOxh2O8grkIIG2RpZwTorYHqTDRm1WUY uSqMxRxO99qaPCmH8N0xhgWQK2dd7cC0iTwYMFvxCNtTvKAPKnRWTCTqdrCYeTPE u6K2BMzMcD4K9gYV76mOLlwi8ld0nlDEnf4SaE69xzZRIr4dYITn81vKYI0lPDmN MY4oa2C0YXnQfVt0X7lkTacrwavxVuitDBr+0FsacM6c6v6ugam1+aReFykFBv6s SIGFVMF9zvyfiNMRzNOlh/aWAHGTOEp33FCFdXysAexgYNacxi7CjXJLtT31jetj zonkhfwWXTt8g6qRh12azQDeZ0MCv4W9SC0CSZCNur6Pv4sKoNQAYUDcqqr7LWvk nT5/ZNKo/x0DVE1EZhII =FPqm -END PGP SIGNATURE- Changes since sdremote-1.0.0-270: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Deselect thumbnailview items when clearing the view.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3052
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/3052/1
Deselect thumbnailview items when clearing the view.
Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 10 insertions(+), 0 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 43bab23..2ba5ea6 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -114,6 +114,16 @@
for ( size_t i = 0; i < n; ++i )
{
ThumbnailViewItem *const pItem = mItemList[i];
+
+// deselect all current selected items and fire events
+if (pItem->isSelected())
+{
+pItem->setSelection(false);
+maItemStateHdl.Call(pItem);
+
+// fire accessible event???
+}
+
if ( pItem->isVisible() && ImplHasAccessibleListeners() )
{
::com::sun::star::uno::Any aOldAny, aNewAny;
--
To view, visit https://gerrit.libreoffice.org/3052
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rafael Dominguez
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix template manager item selection behaviour with mouse.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3053
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/3053/1
Fix template manager item selection behaviour with mouse.
Change-Id: Icf63454973b403eea1cc583fce3a78c5594d
---
M sfx2/source/control/thumbnailview.cxx
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 2ba5ea6..62d4670 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -605,15 +605,22 @@
{
if ( rMEvt.GetClicks() == 1 )
{
-if (pItem->isSelected() && rMEvt.IsMod1())
-pItem->setSelection(false);
+if (rMEvt.IsMod1())
+{
+//Keep selected item group state and just invert current
desired one state
+pItem->setSelection(!pItem->isSelected());
+}
else
{
-if (!pItem->isSelected() && !rMEvt.IsMod1())
-deselectItems( );
-
+//If we got a group of selected items deselect the rest
and only keep the desired one
+//mark items as not selected to not fire unnecessary
change state events.
+pItem->setSelection(false);
+deselectItems();
pItem->setSelection(true);
+}
+if (pItem->isSelected())
+{
bool bClickOnTitle =
pItem->getTextArea().IsInside(rMEvt.GetPosPixel());
pItem->setEditTitle(bClickOnTitle);
}
@@ -622,13 +629,11 @@
DrawItem(pItem);
maItemStateHdl.Call(pItem);
+
+//fire accessible event??
}
else if ( rMEvt.GetClicks() == 2 )
{
-// The mouse button down event 1 click right before is
pointless
-pItem->setSelection(false);
-maItemStateHdl.Call(pItem);
-
Rectangle aRect(pItem->getDrawArea());
if (aRect.IsInside(rMEvt.GetPosPixel()))
--
To view, visit https://gerrit.libreoffice.org/3053
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf63454973b403eea1cc583fce3a78c5594d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Rafael Dominguez
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Syncronize thumbnails ids with SfxDocumentTemplates when mov...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3054
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/3054/1
Syncronize thumbnails ids with SfxDocumentTemplates when moving.
Change-Id: I9ee17e00f769ca16f566b1397d09b76a09273912
---
M sfx2/inc/sfx2/templatelocalview.hxx
M sfx2/source/control/templatelocalview.cxx
M sfx2/source/doc/templatedlg.cxx
3 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx
b/sfx2/inc/sfx2/templatelocalview.hxx
index cf12ddc..7ea226c 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -56,9 +56,9 @@
bool removeTemplate (const sal_uInt16 nItemId, const sal_uInt16
nSrcItemId);
bool moveTemplate (const ThumbnailViewItem* pItem, const sal_uInt16
nSrcItem,
- const sal_uInt16 nTargetItem, bool bCopy);
+ const sal_uInt16 nTargetItem);
-bool moveTemplates (const std::set &rItems, const sal_uInt16 nTargetItem,
bool bCopy);
+bool moveTemplates (const std::set &rItems, const sal_uInt16 nTargetItem);
bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail,
const OUString &rPath);
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 9bb94c3..ddab413 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -289,11 +289,8 @@
}
bool TemplateLocalView::moveTemplate (const ThumbnailViewItem *pItem, const
sal_uInt16 nSrcItem,
- const sal_uInt16 nTargetItem, bool
bCopy)
+ const sal_uInt16 nTargetItem)
{
-bool bRet = true;
-bool bRefresh = false;
-
TemplateContainerItem *pTarget = NULL;
TemplateContainerItem *pSrc = NULL;
@@ -313,16 +310,13 @@
const TemplateViewItem *pViewItem = static_cast(pItem);
-bool bOK;
+bool bCopy =
!mpDocTemplates->Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId);
if (bCopy)
-bOK =
mpDocTemplates->Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnId-1);
-else
-bOK =
mpDocTemplates->Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnId-1);
-
-if (!bOK)
-return false;
-
+{
+if
(!mpDocTemplates->Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId))
+return false;
+}
// move template to destination
TemplateItemProperties aTemplateItem;
@@ -340,37 +334,45 @@
// remove template from region cached data
std::vector::iterator aIter;
-for (aIter = pSrc->maTemplates.begin(); aIter !=
pSrc->maTemplates.end(); ++aIter)
+for (aIter = pSrc->maTemplates.begin(); aIter !=
pSrc->maTemplates.end();)
{
-if (aIter->nId == pViewItem->mnId)
+if (aIter->nDocId == pViewItem->mnDocId)
{
-pSrc->maTemplates.erase(aIter);
-
-RemoveItem(pViewItem->mnId);
-break;
+aIter = pSrc->maTemplates.erase(aIter);
}
+else
+{
+// Keep region document id syncronized with
SfxDocumentTemplates
+if (aIter->nDocId > pViewItem->mnDocId)
+--aIter->nDocId;
+
+++aIter;
+}
+}
+
+// Keep view document id syncronized with SfxDocumentTemplates
+std::vector::iterator pItemIter =
mItemList.begin();
+for (; pItemIter != mItemList.end(); ++pItemIter)
+{
+if (static_cast(*pItemIter)->mnDocId >
pViewItem->mnDocId)
+--static_cast(*pItemIter)->mnDocId;
}
}
-bRefresh = true;
-}
-else
-bRet = false;
-
-if (bRefresh)
-{
lcl_updateThumbnails(pSrc);
lcl_updateThumbnails(pTarget);
CalculateItemPositions();
Invalidate();
+
+return true;
}
-return bRet;
+return false;
}
bool TemplateLocalView::moveTemplates(const std::set &rItems,
- const sal_uInt16 nTargetItem, bool bCopy)
+ const sal_uInt16 nTargetItem)
{
bool ret = true;
bool refresh = false;
@@ -400,17 +402,15 @@
{
const TemplateViewItem *pViewItem = static_cast(*aSelIter);
-bool bOK;
+bool bCopy =
!mpDocTemplates->Move(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnDocId);
if (bCopy)
-bOK =
mpDocTemplates->Copy(nTargetRegion,nTargetIdx,nSrcRegionId,pViewItem->mnId-1);
-else
-bOK =
mpDocTempl
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/chgtrack.cxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 6e33a2bdadefb8b4d3f3d49ad0d843bde60a4623
Author: Stephan Bergmann
Date: Tue Mar 26 12:30:53 2013 +0100
warning C4702: unreachable code
Change-Id: I711c7b1968a3ef8ff88ab71b4de837b599519b8a
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 8912ffa..b1b683c 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1733,27 +1733,21 @@ ScChangeActionContentCellType
ScChangeActionContent::GetContentCellType( const S
case CELLTYPE_STRING :
case CELLTYPE_EDIT :
return SC_CACCT_NORMAL;
-//break;
case CELLTYPE_FORMULA :
switch (rCell.mpFormula->GetMatrixFlag())
{
case MM_NONE :
return SC_CACCT_NORMAL;
-//break;
case MM_FORMULA :
case MM_FAKE :
return SC_CACCT_MATORG;
-//break;
case MM_REFERENCE :
return SC_CACCT_MATREF;
-//break;
}
return SC_CACCT_NORMAL;
-//break;
default:
return SC_CACCT_NONE;
}
-return SC_CACCT_NONE;
}
ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const
ScCellIterator& rIter )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/ooxmlimport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 269b72069746578dd0d89de6b44adb715c39173b Author: LuboÅ¡ LuÅák Date: Tue Mar 26 12:41:16 2013 +0100 fix iint/iiint import from docx math Use the correct LO names for the symbols. Change-Id: I4da760fb84e6f9ca811e13061341f9a993342c29 diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 0b1beda..e3a48ca 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -530,10 +530,10 @@ OUString SmOoxmlImport::handleNary() ret = "int"; break; case MS_IINT: -ret = "liint"; +ret = "iint"; break; case MS_IIINT: -ret = "liiint"; +ret = "iiint"; break; case MS_LINT: ret = "lint"; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] fix iint/iiint import from docx math
Luboš Luňák has abandoned this change. Change subject: fix iint/iiint import from docx math .. Patch Set 1: Abandoned Wrong branch. -- To view, visit https://gerrit.libreoffice.org/3055 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I4da760fb84e6f9ca811e13061341f9a993342c29 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix iint/iiint import from docx math
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3055 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/3055/1 fix iint/iiint import from docx math Use the correct LO names for the symbols. Change-Id: I4da760fb84e6f9ca811e13061341f9a993342c29 --- M starmath/source/ooxmlimport.cxx 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 0b1beda..e3a48ca 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -530,10 +530,10 @@ ret = "int"; break; case MS_IINT: -ret = "liint"; +ret = "iint"; break; case MS_IIINT: -ret = "liiint"; +ret = "iiint"; break; case MS_LINT: ret = "lint"; -- To view, visit https://gerrit.libreoffice.org/3055 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4da760fb84e6f9ca811e13061341f9a993342c29 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] libreoffice-4.0.2.2 tag created
Hi,
there have been created the tag libreoffice-4.0.2.2, aka rc2. The
corresponding official builds will be available within next few days.
It will be used as final if no blocker is found.
See the attached list of changes against 4.0.2.1.
Now, you might switch your current 4-0 source tree to it using:
./g fetch --tags
./g checkout -b tag-libreoffice-4.0.2.2 libreoffice-4.0.2.2
Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.
See also the schedule at
http://wiki.documentfoundation.org/ReleasePlan#4.0_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria
Best Regards,
Petr
deb#703486 keep migrating more user extensions after one failed [Stephan Bergmann]
fdo#44286 [EDITING] Calc decreases one day of a date typed (Brazilian-portuguese locale and timezone) [Eike Rathke]
fdo#52159 EDITING: Error bars values become Y-values when copying charts from calc to writer [Markus Mohrhard]
fdo#54275 Linux: Unable to "Save" (or "Save As") New Document on Samba (gvfs) Mounted Share [Stephan Bergmann]
fdo#57905 UI: Autocorrect Options can not be closed using 'Close-X' at the top right corner of dialog [Joren De Cuyper]
fdo#60462 Small errors in the layout margins of the text boxes [Joren De Cuyper]
fdo#60752 Wrong result because 'Property Let' fails to execute [Noel Power]
fdo#60769 FILEOPEN, FILESAVE, "Could not save document, error in writing sub document context.xml" then corrupt file. [Miklos Vajna]
fdo#61256 Saving particular odg file resets font formatting [Michael Meeks]
fdo#61952 FORMATTING: crash when switching between left and right page [Michael Stahl]
fdo#62111 FILESAVE Libreoffice hangs when exporting a particular .ods to .xlsx [Noel Power]
fdo#62299 Libvisio: Visio document cannot be opend by Draw [Fridrich Štrba]
fdo#62384 Turkish Lira sign should precede numbers, not follow [Andras Timar]
fdo#62617 displaying of object groups having subobjects on different layers is broken [David Tardon]
fdo#62670 TABLE: Splitting a table options are mixed [Joren De Cuyper]
rhbz#895690 Libreoffice causing errors when SAVING files by gvfs-mount (Samba) [Stephan Bergmann]
rhbz#906137 Slide show mode inverts outputs [Caolán McNamara]
rhbz#918938 Crash in Impress when right-clicking selected word [Caolán McNamara]
rhbz#919020 Converting String to Double [Eike Rathke]
* {{deb|703486}} keep migrating more user extensions after one failed [Stephan
Bergmann]
* {{fdo|44286}} [EDITING] Calc decreases one day of a date typed
(Brazilian-portuguese locale and timezone) [Eike Rathke]
* {{fdo|52159}} EDITING: Error bars values become Y-values when copying charts
from calc to writer [Markus Mohrhard]
* {{fdo|54275}} Linux: Unable to "Save" (or "Save As") New Document on Samba
(gvfs) Mounted Share [Stephan Bergmann]
* {{fdo|57905}} UI: Autocorrect Options can not be closed using 'Close-X' at
the top right corner of dialog [Joren De Cuyper]
* {{fdo|60462}} Small errors in the layout margins of the text boxes [Joren De
Cuyper]
* {{fdo|60752}} Wrong result because 'Property Let' fails to execute [Noel
Power]
* {{fdo|60769}} FILEOPEN, FILESAVE, "Could not save document, error in writing
sub document context.xml" then corrupt file. [Miklos Vajna]
* {{fdo|61256}} Saving particular odg file resets font formatting [Michael
Meeks]
* {{fdo|61952}} FORMATTING: crash when switching between left and right page
[Michael Stahl]
* {{fdo|62111}} FILESAVE Libreoffice hangs when exporting a particular .ods to
.xlsx [Noel Power]
* {{fdo|62299}} Libvisio: Visio document cannot be opend by Draw [Fridrich
Štrba]
* {{fdo|62384}} Turkish Lira sign should precede numbers, not follow [Andras
Timar]
* {{fdo|62617}} displaying of object groups having subobjects on different
layers is broken [David Tardon]
* {{fdo|62670}} TABLE: Splitting a table options are mixed [Joren De Cuyper]
* {{rhbz|895690}} Libreoffice causing errors when SAVING files by gvfs-mount
(Samba) [Stephan Bergmann]
* {{rhbz|906137}} Slide show mode inverts outputs [Caolán McNamara]
* {{rhbz|918938}} Crash in Impress when right-clicking selected word [Caolán
McNamara]
* {{rhbz|919020}} Converting String to Double [Eike Rathke]
+ common
+ version 4.0.2.2, tag libreoffice-4.0.2.2 [Petr Mladek]
+ core
+ -Werror=shadow/-Werror=unused-variable [Stephan Bergmann]
+ basic CDbl() and CSng() scan localized number (rhbz#919020) [Eike Rathke]
+ crash in danish thesaurus/spell interaction (rhbz#918938) [Caolán McNamara]
+ display groups on multiple layers correctly (fdo#62617) [David Tardon]
+ don't fail if the end of characters is reached after a field (fdo#62299) [Fridrich Štrba]
+ error bar range is also part of chart range, related (fdo#52159) [Markus Mohrhard]
+ fix for don't count non-default empty rows as rows to repeat (fdo#62111) [Noel Power]
+ fix GVFS UCP, so saving docs works again (fdo#5
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit ea8a0f9631f632a5f886be15ddee982269acea96
Author: Petr Mladek
Date: Tue Mar 26 12:54:08 2013 +0100
bump product version to 4.0.2.2+, number to 2
Change-Id: Ia55ce588963e082dbcbde3fb5652242332f3299a
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index a7ffcf6..f37fcd1 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.2.1
+UREPACKAGEVERSION 4.0.2.2
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.2.1
+ABOUTBOXPRODUCTVERSION 4.0.2.2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.2.1
+ABOUTBOXPRODUCTVERSION 4.0.2.2
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
PACKAGEREVISION 1
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
BRANDPACKAGEVERSION 4.0
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
{
PRODUCTNAME LibreOffice
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
{
PRODUCTNAME LOdev
PRODUCTVERSION 4.0
-PRODUCTEXTENSION .2.1
+PRODUCTEXTENSION .2.2
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.2.1
+PACKAGEVERSION 4.0.2.2
[PATCH libreoffice-4-0] fdo#61429: Stylist: save selection of "Hierarchical" entry
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3056
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/3056/1
fdo#61429: Stylist: save selection of "Hierarchical" entry
This is unfortunately rather ugly because that one is "very special".
(cherry picked from commit 44dd8b838b8dfa74b895a870a68200cf4f3574e0)
Conflicts:
sfx2/source/dialog/templdlg.cxx
Change-Id: Ie2bc9ce2690fbc742b4510e453ca1ef310614256
---
M sfx2/source/dialog/templdlg.cxx
M sfx2/source/inc/templdgi.hxx
M svl/inc/svl/style.hrc
3 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index a81c27d..94e8082 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -753,6 +753,7 @@
bUpdateByExampleDisabled( sal_False ),
bTreeDrag ( sal_True ),
bHierarchical ( sal_False ),
+m_bWantHierarchical ( sal_False ),
bBindingUpdate ( sal_True )
{
aFmtLb.SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString());
@@ -1278,8 +1279,10 @@
}
// if the tree view again, select family hierarchy
-if(pTreeBox)
+if (pTreeBox || m_bWantHierarchical)
+{
aFilterLb.SelectEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString());
+}
// show maximum 14 entries
aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
@@ -1287,12 +1290,21 @@
}
else
{
-if( nActFilter < aFilterLb.GetEntryCount() - 1)
-aFilterLb.SelectEntryPos(nActFilter + 1);
-else
+if (m_bWantHierarchical)
{
nActFilter = 0;
-aFilterLb.SelectEntryPos(1);
+aFilterLb.SelectEntry(SfxResId(
+STR_STYLE_FILTER_HIERARCHICAL).toString());
+}
+else
+{
+if (nActFilter < aFilterLb.GetEntryCount() - 1)
+aFilterLb.SelectEntryPos(nActFilter + 1);
+else
+{
+nActFilter = 0;
+aFilterLb.SelectEntryPos(1);
+}
}
}
@@ -1635,7 +1647,6 @@
//-
-
// Other filters; can be switched by the users or as a result of new or
// editing, if the current document has been assigned a different filter.
void SfxCommonTemplateDialog_Impl::FilterSelect(
@@ -1646,14 +1657,7 @@
if( nEntry != nActFilter || bForce )
{
nActFilter = nEntry;
-SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
-SfxObjectShell *pDocShell = pViewFrame->GetObjectShell();
-if (pDocShell)
-{
-pDocShell->SetAutoStyleFilterIndex(nActFilter);
-SaveFactoryStyleFilter( pDocShell, nActFilter );
-}
-
+SfxObjectShell *const pDocShell = SaveSelection();
SfxStyleSheetBasePool *pOldStyleSheetPool = pStyleSheetPool;
pStyleSheetPool = pDocShell? pDocShell->GetStyleSheetPool(): 0;
if ( pOldStyleSheetPool != pStyleSheetPool )
@@ -1744,6 +1748,8 @@
{
// Turn on treeView
bHierarchical=sal_True;
+m_bWantHierarchical = sal_True;
+SaveSelection(); // fdo#61429 store "hierarchical"
const String aSelectEntry( GetSelectedEntry());
aFmtLb.Hide();
@@ -1776,6 +1782,7 @@
aFmtLb.Show();
// If bHierarchical, then the family can have changed
// minus one since hierarchical is inserted at the start
+m_bWantHierarchical = sal_False; // before FilterSelect
FilterSelect(pBox->GetSelectEntryPos() - 1, bHierarchical );
bHierarchical=sal_False;
}
@@ -1918,6 +1925,10 @@
sal_Int32 nDefault = -1;
nFilter = aFactoryProps.getUnpackedValueOrDefault(
DEFINE_CONST_UNICODE("ooSetupFactoryStyleFilter"), nDefault );
+m_bWantHierarchical =
+(nFilter & SFXSTYLEBIT_HIERARCHY) ? sal_True : sal_False;
+nFilter &= ~SFXSTYLEBIT_HIERARCHY; // clear it
+
return nFilter;
}
@@ -1928,10 +1939,23 @@
OSL_ENSURE( i_pObjSh,
"SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter(): no ObjectShell" );
Sequence< PropertyValue > lProps(1);
lProps[0].Name = DEFINE_CONST_UNICODE("ooSetupFactoryStyleFilter");
-lProps[0].Value = makeAny( i_nFilter );;
+lProps[0].Value = makeAny(
+i_nFilter | (m_bWantHierarchical ? SFXSTYLEBIT_HIERARCHY : 0));
xModuleManager->replaceByName( getModuleIdentifier( xModuleManager,
i_pObjSh ), makeAny( lProps ) );
}
+SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection()
+{
+SfxViewFrame *const
pViewFrame(pBindings->GetDispatcher_Impl()->GetFrame());
+
Re: Trouble regarding fdo#42893
On 26/03/13 12:50, Janit Anjaria wrote: > I have coded the concept patch but i have been getting an error where > the writer "hangs" and doesnt give an appropriate output. possibly there is an infinite loop, attach gdb to soffice.bin and then look at the backtrace, and try to step through the methods until you locate loop that does not terminate. https://wiki.documentfoundation.org/Development/How_to_debug ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: unotools/inc unotools/source vcl/source
unotools/inc/unotools/fontdefs.hxx |4 +++-
unotools/source/misc/fontcvt.cxx | 15 +--
vcl/source/gdi/outdev3.cxx |7 +--
3 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 4e907bc366d8691a33ec0be389f211e22c6e87d3
Author: Chr. Rossmanith
Date: Fri Mar 22 18:06:02 2013 +0100
Replace String with OUString in RecodeString
Change-Id: I987f738d1cd7d640a253f3cd31864290b6d763bf
Reviewed-on: https://gerrit.libreoffice.org/2919
Reviewed-by: Eike Rathke
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/unotools/inc/unotools/fontdefs.hxx
b/unotools/inc/unotools/fontdefs.hxx
index f923464..60c37d4 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/unotools/inc/unotools/fontdefs.hxx
@@ -22,6 +22,8 @@
#include
#include
#include
+#include
+#include
namespace utl {
class FontSubstConfiguration;
@@ -54,7 +56,7 @@ public:
const char* mpSubsFontName;
sal_Unicode (*mpCvtFunc)( sal_Unicode );
sal_Unicode RecodeChar( sal_Unicode c ) const;
-voidRecodeString( String& rStra, xub_StrLen nIndex,
xub_StrLen nLen ) const;
+voidRecodeString( OUString& rStra, sal_Int32 nIndex,
sal_Int32 nLen ) const;
static const ConvertChar* GetRecodeData( const String& rOrgFontName, const
String& rMapFontName );
};
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index fe870ed..99e07ee 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1372,15 +1372,17 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar
) const
// recode the string assuming the character codes are symbol codes
// from an traditional symbol font (i.e. U+F020..U+F0FF)
-void ConvertChar::RecodeString( String& rStr, xub_StrLen nIndex, xub_StrLen
nLen ) const
+void ConvertChar::RecodeString( OUString& rStr, sal_Int32 nIndex, sal_Int32
nLen ) const
{
-sal_uLong nLastIndex = (sal_uLong)nIndex + nLen;
-if( nLastIndex > rStr.Len() )
-nLastIndex = rStr.Len();
+sal_Int32 nLastIndex = nIndex + nLen;
+OUStringBufferaTmpStr(rStr);
+
+if( nLastIndex > aTmpStr.getLength() )
+nLastIndex = aTmpStr.getLength();
for(; nIndex < nLastIndex; ++nIndex )
{
-sal_Unicode cOrig = rStr.GetChar( nIndex );
+sal_Unicode cOrig = rStr[ nIndex ];
// only recode symbols and their U+00xx aliases
if( ((cOrig < 0x0020) || (cOrig > 0x00FF))
&& ((cOrig < 0xF020) || (cOrig > 0xF0FF)) )
@@ -1389,8 +1391,9 @@ void ConvertChar::RecodeString( String& rStr, xub_StrLen
nIndex, xub_StrLen nLen
// recode a symbol
sal_Unicode cNew = RecodeChar( cOrig );
if( cOrig != cNew )
-rStr.SetChar( nIndex, cNew );
+aTmpStr[ nIndex ] = cNew;
}
+rStr = aTmpStr.makeStringAndClear();
}
//===
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index df1016c..565fcae 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5836,8 +5836,11 @@ SalLayout* OutputDevice::ImplLayout( const String&
rOrigStr,
// convert from logical units to physical units
// recode string if needed
-if( mpFontEntry->mpConversion )
-mpFontEntry->mpConversion->RecodeString( aStr, 0, aStr.Len() );
+if( mpFontEntry->mpConversion ) {
+OUString aTmpStr(aStr); // only needed until aStr is OUString as well
+mpFontEntry->mpConversion->RecodeString( aTmpStr, 0,
aTmpStr.getLength() );
+aStr = String(aTmpStr);
+}
long nPixelWidth = nLogicalWidth;
if( nLogicalWidth && mbMap )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/generic vcl/inc vcl/source
vcl/generic/print/genpspgraphics.cxx | 14 --
vcl/inc/generic/genpspgraphics.h |2 +-
vcl/inc/salgdi.hxx |8 ++--
vcl/source/gdi/outdev3.cxx | 11 ---
vcl/source/gdi/salgdilayout.cxx |2 +-
5 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit bc1af14a145f62afb58d6b63e10605d6230073cd
Author: Chr. Rossmanith
Date: Sun Mar 24 09:53:00 2013 +0100
Use OUString and sal_Int32 in filterText()
Change-Id: I31437125b51b07be490de3d979e193fad9750f51
Reviewed-on: https://gerrit.libreoffice.org/2956
Reviewed-by: Chris Sherlock
Reviewed-by: Eike Rathke
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index ec48150..eb6a529 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -1235,12 +1235,13 @@ void GenPspGraphics::AnnounceFonts( ImplDevFontList*
pFontList, const psp::FastP
pFontList->Add( pFD );
}
-bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString&
rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart,
xub_StrLen& rCutStop )
+bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString&
rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32&
rCutStop )
{
if( ! m_pPhoneNr )
return false;
-rCutStop = rCutStart = STRING_NOTFOUND;
+rNewText = rOrig;
+rCutStop = rCutStart = -1;
#define FAX_PHONE_TOKEN "@@#"
#define FAX_PHONE_TOKEN_LENGTH 3
@@ -1260,7 +1261,7 @@ bool GenPspGraphics::filterText( const rtl::OUString&
rOrig, rtl::OUString& rNew
{
nStart = nPos;
m_bPhoneCollectionActive = true;
-m_aPhoneCollection = rtl::OUString();
+m_aPhoneCollection = "";
bRet = true;
bStarted = true;
}
@@ -1286,13 +1287,13 @@ bool GenPspGraphics::filterText( const rtl::OUString&
rOrig, rtl::OUString& rNew
aPhoneNr.append( m_aPhoneCollection );
aPhoneNr.append( "" );
*m_pPhoneNr = aPhoneNr.makeStringAndClear();
-m_aPhoneCollection = rtl::OUString();
+m_aPhoneCollection = "";
}
}
if( m_aPhoneCollection.getLength() > 1024 )
{
m_bPhoneCollectionActive = false;
-m_aPhoneCollection = rtl::OUString();
+m_aPhoneCollection = "";
bRet = false;
}
@@ -1301,7 +1302,8 @@ bool GenPspGraphics::filterText( const rtl::OUString&
rOrig, rtl::OUString& rNew
rLen -= nStop - nStart;
rCutStart = nStart+nIndex;
rCutStop = nStop+nIndex;
-rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) : rtl::OUString()
) + rOrig.copy( rCutStop );
+if (rCutStart != rCutStop)
+rNewText = ( rCutStart ? rOrig.copy( 0, rCutStart ) :
rtl::OUString() ) + rOrig.copy( rCutStop );
}
return bRet && m_bSwallowFaxNo;
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 99a2f35..36c0e60 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -175,7 +175,7 @@ public:
virtual voidinvert( sal_uIntPtr nPoints, const SalPoint*
pPtAry, SalInvert nFlags );
virtual sal_BooldrawEPS( long nX, long nY, long nWidth, long
nHeight, void* pPtr, sal_uIntPtr nSize );
-virtual boolfilterText( const rtl::OUString& rOrigText,
rtl::OUString& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen&
rCutStart, xub_StrLen& rCutStop );
+virtual boolfilterText( const rtl::OUString& rOrigText,
rtl::OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32&
rCutStart, sal_Int32& rCutStop );
virtual booldrawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index ac2d036..21d7380 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -346,12 +346,8 @@ public:
true: a substitution has taken place and rNewText rLen, rCutStart and
rCutStop have been filled accordingly
false: no substitution has taken place, rNewText, rLen, rCutStart,
rCutStop remain unchanged
*/
-virtual boolfilterText( const rtl::OUString& rOrigText,
-rtl::OUString& rNewText,
-xub_StrLen nIndex,
-xub_StrLen& rLen,
-xub_StrLen& rCutStart,
-xub_StrLen& rCutStop );
+virtual boolfilterText( const rtl::OUString& rOrigText,
rtl::OUString& rNewText,
+sal_Int32 nIndex, sal_Int32& rLen,
sal_Int32& rCutS
[PUSHED] Replace String with OUString in RecodeString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2919 Approvals: Eike Rathke: Looks good to me, approved Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2919 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I987f738d1cd7d640a253f3cd31864290b6d763bf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Use OUString and sal_Int32 in filterText()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2956 Approvals: Eike Rathke: Looks good to me, approved Chris Sherlock: Looks good to me, but someone else must approve Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2956 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31437125b51b07be490de3d979e193fad9750f51 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Chris Sherlock Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/outdev.hxx |9 +++--
vcl/source/gdi/outdev3.cxx | 45 ++---
2 files changed, 29 insertions(+), 25 deletions(-)
New commits:
commit a89fda4b7f09856ba136f0a4df7929f7ee3f796b
Author: Chr. Rossmanith
Date: Sun Mar 24 10:15:45 2013 +0100
Use OUString and sal_Int32 in ImplPrepareLayoutArgs() and GetTextIsRTL()
Change-Id: Ib1b659aa56a38efdfc2dddb5e362ac1eb54972f1
Reviewed-on: https://gerrit.libreoffice.org/2959
Reviewed-by: Eike Rathke
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index e51ec2b..5f00757 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -382,10 +382,8 @@ public:
xub_StrLen nLen, const Point&
rLogicPos = Point(0,0),
long nLogicWidth=0, const
sal_Int32* pLogicDXArray=NULL,
bool bFilter = false ) const;
-SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( String&,
-xub_StrLen nIndex, xub_StrLen nLen,
-long nPixelWidth,
-const sal_Int32* pPixelDXArray )
const;
+SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const
sal_Int32 nIndex, const sal_Int32 nLen,
+long nPixelWidth, const sal_Int32*
pPixelDXArray ) const;
SAL_DLLPRIVATE SalLayout* ImplGlyphFallbackLayout( SalLayout*,
ImplLayoutArgs& ) const;
static
@@ -1060,8 +1058,7 @@ public:
sal_uInt16 GetBitCount() const;
-sal_BoolGetTextIsRTL( const String&, xub_StrLen nIndex,
-xub_StrLen nLen ) const;
+sal_BoolGetTextIsRTL( const OUString&, sal_Int32 nIndex,
sal_Int32 nLen ) const;
/** Query the existence and depth of the alpha channel
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index a2e2e1b..1fedcbd 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5665,13 +5665,13 @@ void OutputDevice::DrawStretchText( const Point&
rStartPt, sal_uLong nWidth,
mpAlphaVDev->DrawStretchText( rStartPt, nWidth, rStr, nIndex, nLen );
}
-ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( String& rStr,
- xub_StrLen nMinIndex, xub_StrLen nLen,
+ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr,
+ const sal_Int32 nMinIndex, const
sal_Int32 nLen,
long nPixelWidth, const sal_Int32*
pDXArray ) const
{
// get string length for calculating extents
-xub_StrLen nEndIndex = rStr.Len();
-if( (sal_uLong)nMinIndex + nLen < nEndIndex )
+sal_Int32 nEndIndex = rStr.getLength();
+if( nMinIndex + nLen < nEndIndex )
nEndIndex = nMinIndex + nLen;
// don't bother if there is nothing to do
@@ -5686,8 +5686,8 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
String& rStr,
else if( 0 == (mnTextLayoutMode & TEXT_LAYOUT_BIDI_RTL) )
{
// disable Bidi if no RTL hint and no RTL codes used
-const sal_Unicode* pStr = rStr.GetBuffer() + nMinIndex;
-const sal_Unicode* pEnd = rStr.GetBuffer() + nEndIndex;
+const sal_Unicode* pStr = rStr.getStr() + nMinIndex;
+const sal_Unicode* pEnd = rStr.getStr() + nEndIndex;
for( ; pStr < pEnd; ++pStr )
if( ((*pStr >= 0x0580) && (*pStr < 0x0800)) // middle eastern
scripts
|| ((*pStr >= 0xFB18) && (*pStr < 0xFE00)) // hebrew + arabic A
presentation forms
@@ -5711,8 +5711,8 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
String& rStr,
else
{
// disable CTL for non-CTL text
-const sal_Unicode* pStr = rStr.GetBuffer() + nMinIndex;
-const sal_Unicode* pEnd = rStr.GetBuffer() + nEndIndex;
+const sal_Unicode* pStr = rStr.getStr() + nMinIndex;
+const sal_Unicode* pEnd = rStr.getStr() + nEndIndex;
for( ; pStr < pEnd; ++pStr )
if( ((*pStr >= 0x0300) && (*pStr < 0x0370)) // diacritical marks
|| ((*pStr >= 0x0590) && (*pStr < 0x10A0)) // many CTL scripts
@@ -5731,9 +5731,10 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
String& rStr,
if( meTextLanguage ) //TODO: (mnTextLayoutMode &
TEXT_LAYOUT_SUBSTITUTE_DIGITS)
{
// disable character localization when no digits used
-const sal_Unicode* pBase = rStr.GetBuffer();
+const sal_Unicode* pBase = rStr.getStr();
const sal_Unicode* pStr = pBase + nMinIndex;
const sal_Unicode* pEnd = pBase + nEndIndex;
+OUStringBuffer sTmpStr(rStr);
for( ; pStr < pEnd; ++pStr )
{
// TODO: are there
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/outdev.hxx | 12 -
vcl/source/gdi/outdev3.cxx | 55 +
2 files changed, 26 insertions(+), 41 deletions(-)
New commits:
commit ffb837eed2c6f843f12f9368ed2183660a0036a1
Author: Chr. Rossmanith
Date: Sun Mar 24 16:30:20 2013 +0100
Use OUString and sal_Int32 in GetTextArray() and ImplLayout()
Change-Id: I2c1e5b7d53c0d78f2ccf9ac317a7ff40298cd68d
Reviewed-on: https://gerrit.libreoffice.org/2967
Reviewed-by: Eike Rathke
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 5f00757..44a5979 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -378,10 +378,9 @@ public:
SAL_DLLPRIVATE bool ImplSelectClipRegion( const Region&,
SalGraphics* pGraphics = NULL );
SAL_DLLPRIVATE void ImplSetClipRegion( const Region* pRegion );
-SAL_DLLPRIVATE SalLayout* ImplLayout( const String&, xub_StrLen nIndex,
-xub_StrLen nLen, const Point&
rLogicPos = Point(0,0),
-long nLogicWidth=0, const
sal_Int32* pLogicDXArray=NULL,
-bool bFilter = false ) const;
+SAL_DLLPRIVATE SalLayout* ImplLayout( const OUString&, sal_Int32 nIndex,
sal_Int32 nLen,
+const Point& rLogicPos =
Point(0,0), long nLogicWidth=0,
+const sal_Int32*
pLogicDXArray=NULL, bool bFilter = false ) const;
SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const
sal_Int32 nIndex, const sal_Int32 nLen,
long nPixelWidth, const sal_Int32*
pPixelDXArray ) const;
SAL_DLLPRIVATE SalLayout* ImplGlyphFallbackLayout( SalLayout*,
ImplLayoutArgs& ) const;
@@ -583,9 +582,8 @@ public:
const sal_Int32* pDXAry = NULL,
xub_StrLen nIndex = 0,
xub_StrLen nLen = STRING_LEN );
-longGetTextArray( const XubString& rStr, sal_Int32* pDXAry
= NULL,
- xub_StrLen nIndex = 0,
- xub_StrLen nLen = STRING_LEN ) const;
+longGetTextArray( const OUString& rStr, sal_Int32* pDXAry
= NULL,
+ sal_Int32 nIndex = 0, sal_Int32 nLen =
-1 ) const;
boolGetCaretPositions( const XubString&, sal_Int32*
pCaretXArray,
xub_StrLen nIndex, xub_StrLen nLen,
sal_Int32* pDXAry = NULL, long nWidth =
0,
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 1fedcbd..56d1d4a 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5475,7 +5475,11 @@ long OutputDevice::GetTextWidth( const String& rStr,
{
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-long nWidth = GetTextArray( rStr, NULL, nIndex, nLen );
+sal_Int32 nLen2 = (nLen == STRING_LEN) ? -1 : nLen; // only needed until
nLen is sal_Int32
+sal_Int32 nIndex2 = nIndex;// ditto
+OUString aTmpStr(rStr);
+long nWidth = GetTextArray( aTmpStr, NULL, nIndex2, nLen2 );
+
return nWidth;
}
@@ -5532,15 +5536,17 @@ void OutputDevice::DrawTextArray( const Point&
rStartPt, const String& rStr,
mpAlphaVDev->DrawTextArray( rStartPt, rStr, pDXAry, nIndex, nLen );
}
-long OutputDevice::GetTextArray( const String& rStr, sal_Int32* pDXAry,
- xub_StrLen nIndex, xub_StrLen nLen ) const
+long OutputDevice::GetTextArray( const OUString& rStr, sal_Int32* pDXAry,
+ sal_Int32 nIndex, sal_Int32 nLen ) const
{
+// MEM: default nLen = STRING_LENGTH
DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-if( nIndex >= rStr.Len() )
+if( nIndex >= rStr.getLength() )
return 0;
-if( (sal_uLong)nIndex+nLen >= rStr.Len() )
-nLen = rStr.Len() - nIndex;
+
+if( nLen < 0 || nIndex+nLen >= rStr.getLength() )
+nLen = rStr.getLength() - nIndex;
// do layout
SalLayout* pSalLayout = ImplLayout( rStr, nIndex, nLen );
@@ -5776,12 +5782,8 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs(
OUString& rStr,
return aLayoutArgs;
}
-SalLayout* OutputDevice::ImplLayout( const String& rOrigStr,
- xub_StrLen nMinIndex,
- xub_StrLen nLen,
- const Point& rLogicalPos,
- long nLogicalWidth,
- const sal_Int32* pDXArray,
+SalLayout* OutputDevice::ImplLayout( const OUString& rOrigStr, sal_Int32
nMinIndex, sal_Int3
[PUSHED] Use OUString and sal_Int32 in GetTextArray() and ImplLayout(...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2967 Approvals: Eike Rathke: Looks good to me, approved Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2967 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2c1e5b7d53c0d78f2ccf9ac317a7ff40298cd68d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Use OUString and sal_Int32 in ImplPrepareLayoutArgs() and Ge...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2959 Approvals: Eike Rathke: Looks good to me, approved Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2959 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1b659aa56a38efdfc2dddb5e362ac1eb54972f1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Fridrich Strba ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 60 ---
vcl/aqua/source/dtrans/DataFlavorMapping.hxx |4 +
2 files changed, 58 insertions(+), 6 deletions(-)
New commits:
commit 9fccdcaf810e543e28bca662300b5936ad7acf30
Author: Herbert Dürr
Date: Mon May 14 15:10:16 2012 +
(author=pl) fix for transporting OOo types through OSX system clipboard
Change-Id: Idc00fbc8ac1adb04c76ecb4b641cfa055f5901b8
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 23dbfd4..b030ac8 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -50,6 +50,8 @@ using ::rtl::OString;
namespace // private
{
+ const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence*)0);
+
/* Determine whether or not a DataFlavor is valid.
*/
bool isValidFlavor(const DataFlavor& aFlavor)
@@ -59,6 +61,22 @@ namespace // private
return ((len > 0) && ((dtype == getCppuType((Sequence*)0)) ||
(dtype == getCppuType( (OUString*)0 ;
}
+ OUString NSStringToOUString(NSString* cfString)
+ {
+BOOST_ASSERT(cfString && "Invalid parameter");
+
+const char* utf8Str = [cfString UTF8String];
+unsigned int len = rtl_str_getLength(utf8Str);
+
+return OUString(utf8Str, len, RTL_TEXTENCODING_UTF8);
+ }
+
+ NSString* OUStringToNSString(const OUString& ustring)
+ {
+OString utf8Str = OUStringToOString(ustring, RTL_TEXTENCODING_UTF8);
+return [NSString stringWithCString: utf8Str.getStr() encoding:
NSUTF8StringEncoding];
+ }
+
NSString* PBTYPE_SODX =
@"application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star
Object Descriptor (XML)\"";
NSString* PBTYPE_SESX =
@"application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed
Source (XML)\"";
NSString* PBTYPE_SLSDX =
@"application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link
Source Descriptor (XML)\"";
@@ -499,6 +517,16 @@ DataFlavorMapper::DataFlavorMapper()
mrXMimeCntFactory = MimeContentTypeFactory::create( xContext );
}
+DataFlavorMapper::~DataFlavorMapper()
+{
+// release potential NSStrings
+for( OfficeOnlyTypes::iterator it = maOfficeOnlyTypes.begin(); it !=
maOfficeOnlyTypes.end(); ++it )
+{
+[it->second release];
+it->second = nil;
+}
+}
+
DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor(NSString*
systemDataFlavor) const
{
DataFlavor oOOFlavor;
@@ -514,22 +542,41 @@ DataFlavor
DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor
}
} // for
- return oOOFlavor;
+// look if this might be an internal type; if it comes in here it must have
+// been through openOfficeToSystemFlavor before, so it should then be in
the map
+OUString aTryFlavor( NSStringToOUString( systemDataFlavor ) );
+if( maOfficeOnlyTypes.find( aTryFlavor ) != maOfficeOnlyTypes.end() )
+{
+oOOFlavor.MimeType = aTryFlavor;
+oOOFlavor.HumanPresentableName = OUString();
+oOOFlavor.DataType = CPPUTYPE_SEQINT8;
+}
+
+return oOOFlavor;
}
NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor&
oOOFlavor) const
{
- NSString* sysFlavor = NULL;
+NSString* sysFlavor = NULL;
- for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++)
+for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
{
- if
(oOOFlavor.MimeType.startsWith(OUString::createFromAscii(flavorMap[i].OOoFlavor)))
+ if
(oOOFlavor.MimeType.startsWith(OUString::createFromAscii(flavorMap[i].OOoFlavor)))
{
- sysFlavor = flavorMap[i].SystemFlavor;
+sysFlavor = flavorMap[i].SystemFlavor;
}
}
- return sysFlavor;
+if( ! sysFlavor )
+{
+OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find(
oOOFlavor.MimeType );
+if( it == maOfficeOnlyTypes.end() )
+sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] =
OUStringToNSString( oOOFlavor.MimeType );
+else
+sysFlavor = it->second;
+}
+
+return sysFlavor;
}
NSString* DataFlavorMapper::openOfficeImageToSystemFlavor(NSPasteboard*
pPasteboard) const
@@ -668,6 +715,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const
com::sun::star::uno:
if (str != NULL)
{
+ [str retain];
[array addObject: str];
}
}
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 3efe8cf..7ef3640 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -29,6 +29,7 @@
#import
#include
+#include
#include
#include
@@ -65,6 +66,7 @@ public:
cannot be created.
*/
DataFlavorMapper();
+ ~DataFlavorMapper();
/* Map a system data flavor to an OpenOffice data flavor.
@@ -128,6 +130,8 @@ private:
private:
::com::sun::st
[Libreoffice-commits] core.git: svl/inc
svl/inc/svl/style.hrc | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 5bd206efc74671ce4b9c1371d1cae635970f54bb Author: Michael Stahl Date: Tue Mar 26 13:55:55 2013 +0100 style.hrc: translate comments Change-Id: I00766a327a99b6fd5eed8e0ba411f3f71f07e942 diff --git a/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc index 83c7153..352cfe1 100644 --- a/svl/inc/svl/style.hrc +++ b/svl/inc/svl/style.hrc @@ -17,17 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_STYLE_HRC -#define _SFX_STYLE_HRC +#ifndef SFX_STYLE_HRC +#define SFX_STYLE_HRC -#define SFXSTYLEBIT_AUTO0x // automatisch; Flags kommen von der Applikation -#define SFXSTYLEBIT_HIDDEN 0x0200 // benutzte Vorlage (als Suchmaske) -#define SFXSTYLEBIT_HIERARCHY 0x1000 // hierarchical view - just for dialog -#define SFXSTYLEBIT_READONLY0x2000 // benutzte Vorlage (als Suchmaske) -#define SFXSTYLEBIT_USED0x4000 // benutzte Vorlage (als Suchmaske) -#define SFXSTYLEBIT_USERDEF 0x8000 // benutzerdefinierte Vorlage -#define SFXSTYLEBIT_ALL_VISIBLE 0xFDFF // alle Vorlagen -#define SFXSTYLEBIT_ALL 0x // alle Vorlagen +#define SFXSTYLEBIT_AUTO0x ///< automatic: flags from application +#define SFXSTYLEBIT_HIDDEN 0x0200 ///< hidden styles (search mask) +#define SFXSTYLEBIT_HIERARCHY 0x1000 ///< hierarchical view - just for dialog +#define SFXSTYLEBIT_READONLY0x2000 ///< readonly styles (search mask) +#define SFXSTYLEBIT_USED0x4000 ///< used styles (search mask) +#define SFXSTYLEBIT_USERDEF 0x8000 ///< user defined styles (search mask) +#define SFXSTYLEBIT_ALL_VISIBLE 0xFDFF ///< all styles +#define SFXSTYLEBIT_ALL 0x ///< all styles #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl
scripts/esc-bug-stats.pl | 90 +++
1 file changed, 90 insertions(+)
New commits:
commit c2ca429a1a25adeeb65ae881a343ddac9c502ade
Author: Michael Meeks
Date: Tue Mar 26 13:03:20 2013 +
start to automate the number collection.
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
new file mode 100755
index 000..9a7a152
--- /dev/null
+++ b/scripts/esc-bug-stats.pl
@@ -0,0 +1,90 @@
+#!/usr/bin/perl -w
+
+sub get_url($)
+{
+my $url = shift;
+my @lines;
+my $handle;
+open ($handle, "curl -s '$url' 2>&1 |") || die "can't exec curl: $!";
+while (<$handle>) {
+ push @lines, $_;
+}
+close ($handle);
+return @lines;
+}
+
+sub get_deps($)
+{
+my ($url) = @_;
+my @bugs = get_url($url);
+
+my $bug_count = -1;
+while (my $line = shift (@bugs)) {
+ if ($line =~ m/^\s*depends on\s*$/) {
+ $line = shift @bugs;
+# print STDERR "Have depends on\n";
+ if ($line =~ m/^\s*(\d+)\s*$/) {
+ my $num = $1;
+ $line = shift @bugs;
+ $line = shift @bugs;
+ if ($line =~ m/bugs:/) {
+ $bug_count = $num;
+ last;
+ }
+ } else {
+ print STDERR "odd depends on follow-on: '$line'\n";
+ }
+ }
+}
+return $bug_count;
+}
+
+sub get_query($)
+{
+my ($url) = @_;
+my @bugs = get_url($url);
+
+my $bug_count = -1;
+while (my $line = shift (@bugs)) {
+ if ($line =~ m/(\d+) bugs found./) {
+ $bug_count = $1;
+ last;
+ }
+}
+return $bug_count;
+}
+
+my %bug_to_ver = (
+'4.1' => '60270',
+'4.0' => '54157',
+'3.6' => '6'
+);
+
+print "Querying for open MABs:\n";
+for my $ver (sort keys %bug_to_ver) {
+my $bug = $bug_to_ver{$ver};
+my $base_url = "https://bugs.freedesktop.org/showdependencytree.cgi?id="; .
$bug;
+my $all = get_deps($base_url);
+my $open = get_deps($base_url . "&hide_resolved=1");
+$percent = ($open * 100.0) / $all;
+print "$ver: $open/$all - $percent%\n";
+}
+
+my ($all, $open);
+
+print "Querying for regressions:\n";
+my
$regression_query="https://bugs.freedesktop.org/buglist.cgi?columnlist=bug_severity%2Cpriority%2Ccomponent%2Cop_sys%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc&keywords=regression%2C%20&keywords_type=allwords&list_id=267671&product=LibreOffice&query_format=advanced&order=bug_id&limit=0";;
+my
$regression_open_query="https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20&keywords_type=allwords&list_id=267687&columnlist=bug_severity%2Cpriority%2Ccomponent%2Cop_sys%2Cassigned_to%2Cbug_status%2Cresolution%2Cshort_desc&resolution=---&query_based_on=Regressions&query_format=advanced&product=LibreOffice&known_name=Regressions&limit=0";;
+$all = get_query($regression_query);
+$open = get_query($regression_open_query);
+print "$open/$all\n";
+
+print "Querying for bibisection:\n";
+my $bibisect_query =
"https://bugs.freedesktop.org/buglist.cgi?n2=1&f1=status_whiteboard&list_id=267679&o1=substring&resolution=---&resolution=FIXED&resolution=INVALID&resolution=WONTFIX&resolution=DUPLICATE&resolution=WORKSFORME&resolution=MOVED&resolution=NOTABUG&resolution=NOTOURBUG&query_based_on=BibisectedAll&o2=substring&query_format=advanced&f2=status_whiteboard&v1=bibisected&v2=bibisected35older&product=LibreOffice&known_name=BibisectedAll&limit=0";;
+my $bibisect_open_query =
"https://bugs.freedesktop.org/buglist.cgi?n2=1&f1=status_whiteboard&list_id=267685&o1=substring&resolution=---&query_based_on=Bibisected&o2=substring&query_format=advanced&f2=status_whiteboard&v1=bibisected&v2=bibisected35older&product=LibreOffice&known_name=Bibisected&limit=0";;
+
+$all = get_query($bibisect_query);
+$open = get_query($bibisect_open_query);
+print "$open/$all\n";
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: make bridges work with clang on x64 linux
On Tue, Mar 26, 2013 at 3:45 AM, Stephan Bergmann wrote: > What Linux version would that be? It's a gentoo box. I'm using clang 3.2 and llvm 3.2. I've attached the gentoo package version info. I'd be more than happy to try out a patch or something to try and fix this properly. Thanks, Peter i Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: opengrok feature request: correcting links to .hxx files
Hi Noel, *, don't be afraid, no Zombie attacks, just happened to stumble upon this with a different search :-) On Sun, Dec 23, 2012 at 7:37 AM, Noel Grandin wrote: > > Anybody feel like hacking on opengrok - I have a small request. > > The parsing for header file includes does not seem to know how to correctly > grep our .hxx header files. > [...] > #include "AsyncronousLink.hxx" > [...] > which incorrectly points to the file > AsyncronousLink.h This should be fixed with current versions of opengrok. "Bug #16760: Generating incorrect links for C/C++ "#include" statements if extension of a header file is not on the lexer's list" So our copy of opengrok 0.9 should be replaced with 0.11.1 https://github.com/OpenGrok/OpenGrok/wiki/File-downloads Needs regenerating the indexes again though (on that occasion, one could enable leading wildcards as well) And as they mention UI changes, maybe the LO-branding from https://github.com/tdf/www-opengrok/ needs some little tweaking. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/vcl/field.hxx|2 -
vcl/source/control/field.cxx | 80 +++
2 files changed, 45 insertions(+), 37 deletions(-)
New commits:
commit 84bac1799e528272ca808240508ca3f66272ee13
Author: Zolnai Tamás
Date: Mon Mar 25 13:02:01 2013 +0100
Kill double conversion from NumericBox
Change-Id: Id1161c40725f75ea0d7ec3f15a19ca14defd0a75
Reviewed-on: https://gerrit.libreoffice.org/3035
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index ec661c6..50888c6 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -170,7 +170,7 @@ protected:
voidFieldLast();
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
-SAL_DLLPRIVATE sal_Bool ImplNumericReformat( const OUString& rStr, double&
rValue, OUString& rOutStr );
+SAL_DLLPRIVATE sal_Bool ImplNumericReformat( const OUString& rStr,
sal_Int64& rValue, OUString& rOutStr );
SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue );
SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection*
pNewSelection = NULL );
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 69cb02e..3dead80 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -89,7 +89,7 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const
KeyEvent& rKEvt,
// ---
-static sal_Bool ImplNumericGetValue( const OUString& rStr, double& rValue,
+static sal_Bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue,
sal_uInt16 nDecDigits, const
LocaleDataWrapper& rLocaleDataWrappper,
sal_Bool bCurrency = sal_False )
{
@@ -196,7 +196,19 @@ static sal_Bool ImplNumericGetValue( const OUString& rStr,
double& rValue,
aStr = aStr1.makeStringAndClear() + aStr2.makeStringAndClear();
// check range
-double nValue = rtl::OUString(aStr).toDouble();
+sal_Int64 nValue = aStr.toInt64();
+if( nValue == 0 )
+{
+// check if string is equivalent to zero
+sal_Int16 nIndex = bNegative ? 1 : 0;
+while( aStr[nIndex] == '0' && nIndex < aStr.getLength() )
+++nIndex;
+if( nIndex < aStr.getLength() )
+{
+rValue = bNegative ? SAL_MIN_INT64 : SAL_MAX_INT64;
+return sal_True;
+}
+}
if (bRound)
{
if ( !bNegative )
@@ -428,23 +440,22 @@ sal_Bool FormatterBase::IsEmptyFieldValue() const
// ---
-sal_Bool NumericFormatter::ImplNumericReformat( const OUString& rStr, double&
rValue,
+sal_Bool NumericFormatter::ImplNumericReformat( const OUString& rStr,
sal_Int64& rValue,
OUString& rOutStr )
{
if ( !ImplNumericGetValue( rStr, rValue, GetDecimalDigits(),
ImplGetLocaleDataWrapper() ) )
return sal_True;
else
{
-double nTempVal = rValue;
-// caution: precision loss in double cast
+sal_Int64 nTempVal = rValue;
if ( nTempVal > mnMax )
-nTempVal = (double)mnMax;
+nTempVal = mnMax;
else if ( nTempVal < mnMin )
-nTempVal = (double)mnMin;
+nTempVal = mnMin;
if ( GetErrorHdl().IsSet() && (rValue != nTempVal) )
{
-mnCorrectedValue = (sal_Int64)nTempVal;
+mnCorrectedValue = nTempVal;
if ( !GetErrorHdl().Call( this ) )
{
mnCorrectedValue = 0;
@@ -454,7 +465,7 @@ sal_Bool NumericFormatter::ImplNumericReformat( const
OUString& rStr, double& rV
mnCorrectedValue = 0;
}
-rOutStr = CreateFieldText( (sal_Int64)nTempVal );
+rOutStr = CreateFieldText( nTempVal );
return sal_True;
}
}
@@ -627,17 +638,16 @@ sal_Int64 NumericFormatter::GetValue() const
if ( !GetField() )
return 0;
-double nTempValue;
+sal_Int64 nTempValue;
if ( ImplNumericGetValue( GetField()->GetText(), nTempValue,
GetDecimalDigits(), ImplGetLocaleDataWrapper() )
)
{
-// caution: precision loss in double cast
if ( nTempValue > mnMax )
-nTempValue = (double)mnMax;
+nTempValue = mnMax;
else if ( nTempValue < mnMin )
-nTempValue = (double)mnMin;
-return (sal_Int64)nTempValue;
+nTempValue = mnMin;
+return nTempValue;
}
else
return mnLastValue;
@@ -690,10 +700,9 @@ void NumericFormatter::Reformat()
return;
OUString aStr;
-// caution: precision loss in double cast
-double nTemp = (double)mnLastValue;
+sal_Int64 nTemp = mnLastValue;
sal_Bool bOK = ImplNumericRefor
[PUSHED] Kill double conversion from NumericBox
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3035 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3035 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1161c40725f75ea0d7ec3f15a19ca14defd0a75 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Zolnai Tamás Gerrit-Reviewer: Eike Rathke Gerrit-Reviewer: Zolnai Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#51296:UI: Calc doesn't take care of security setting "Ctrl-click required to follow hyperlinks
On Mon, Mar 25, 2013 at 5:56 PM, Akash Shetye wrote: > > Petr thank you for your suggestions, I happened to overlook the "Ctrl-click > to open hyperlink" prefix string to the tooltips in excitement oh having a > patch :P. Now that I have taken a look at sc/ code, I find that the prefixed > string is not hardcoded into the sw/ code. Also how sc/ and sw/ handle > hyperlinks is very differently. I tried probing into the vcl part about > fixedhyperlink.cxx to trace things back up from there but things aren't > working well. Just knowing which part of code is doing the tooltip content > setting in sc/ will be cool enough. Thanks for cc'ing the experts. Yup, it needs some search. I am not much familiar with this code as well. so, I suggest to compare the working code Writer with the code in Calc. In writer, it starts at http://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/utlui/initui.src#n137 where the English string "STR_HYPERLINK_CLICK" is defined "%s-click to open hyperlink". Then you might see http://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/utlui/initui.hrc#n51 , where we define some integer ID for the string STR_HYPERLINK_CLICK The localized string is loaded at http://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/utlui/initui.cxx#n157 and the "%s" is replaced by a real key code at http://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/utlui/initui.cxx#n170 The string (variable aHyperlinkClick) is later used at http://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/docvw/edtwin2.cxx#n220 http://cgit.freedesktop.org/libreoffice/core/tree/sw/source/ui/docvw/SidebarTxtControl.cxx#n247 I think that edtwin2.cxx#n220 is the location that is responsible for showing the tooltip when you hover over the hyperlink in Writer editor. I think that SidebarTxtControl.cxx#n247 is just another place where you could see similar tooltip but I am not sure where it is. And now the fun is to find the related code in Calc. My guess is that it might be somewhere around sc/source/ui/view. In each case, it should be under sc/source/ui. When I go back to sw/source/ui/docvw/edtwin2.cxx, the variable "aHyperlinkClick" is assigned to "sTxt" which is later passed to Help::ShowQuickHelp, so I would search for "ShowQuickHelp" and "hyperlink" under sc/source/ui and try to fix where the hyperlink is assigned to the tooltip string. If you find this place, you need to: + define the string "%s-click to open hyperlink" in some Calc-specific .src file + define the related ID in the .hrc file + load the string as it was done in sw/source/ui/utlui/initui.cxx#n157 + substiture the %s by the real key code + and finally add the string to the tooltip string if the SvtSecurityOptions::E_CTRLCLICK_HYPERLINK option is set I hope that the above makes sense and could help you. Feel free to ask if you get lost. I am sure that Kohei or another Calc expert could give you even more precise hints. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Trouble regarding fdo#42893
On Tue, 2013-03-26 at 17:20 +0530, Janit Anjaria wrote: > I have coded the concept patch but i have been getting an error where > the writer "hangs" and doesnt give an appropriate output. Great :-) then you have some endless loop on the main thread. > It would be great if someone could provide me help so i can complete > the bug hence LO gets this feature up working asap. So - do: $ ps auwx | grep soffice.bin # note the pid of soffice.bin gdb attach ... -c thread apply all backtrace And (I imagine thread one) should be in the piece of code that is hanging. Quite possibly you need to re-configure with --enable-symbols and re-build just the piece that is hanging (initially) to get gdb to show you much that is of use :-) HTH, Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - svx/inc svx/source sw/source
svx/inc/svx/sdrmasterpagedescriptor.hxx|4 ++--
svx/inc/svx/sdrpaintwindow.hxx |4 ++--
svx/inc/svx/svdcrtv.hxx|6 +++---
svx/inc/svx/svddrgv.hxx|3 +--
svx/inc/svx/svdhdl.hxx | 12 ++--
svx/source/sdr/contact/objectcontactofpageview.cxx |6 +++---
svx/source/svdraw/charthelper.cxx | 16 ++--
svx/source/svdraw/clonelist.cxx|8
svx/source/svdraw/gradtrns.cxx |2 +-
svx/source/svdraw/gradtrns.hxx |2 +-
svx/source/svdraw/sdrmasterpagedescriptor.cxx |4 ++--
svx/source/svdraw/sdrpagewindow.cxx|6 +++---
svx/source/svdraw/sdrpaintwindow.cxx |4 ++--
svx/source/svdraw/svdattr.cxx |6 +++---
svx/source/svdraw/svdcrtv.cxx | 14 +++---
svx/source/svdraw/svddrgv.cxx | 14 +++---
svx/source/svdraw/svdmrkv.cxx |8
svx/source/svdraw/svdpntv.cxx |4 ++--
svx/source/svdraw/svdview.cxx |6 +++---
sw/source/ui/inc/view.hxx |6 +++---
sw/source/ui/uiview/viewdraw.cxx |4 ++--
sw/source/ui/uiview/viewport.cxx | 14 +++---
22 files changed, 70 insertions(+), 83 deletions(-)
New commits:
commit 0bd5a8d3f26590f467379042597f91be681fe25e
Author: Takeshi Abe
Date: Tue Mar 26 22:25:24 2013 +0900
sal_Bool to bool
Change-Id: I27a444a8313bff276e377ffb87458213f4e19707
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx
b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index 20658c1..1917a68 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -80,8 +80,8 @@ namespace sdr
void SetVisibleLayers(const SetOfByte& rNew);
// operators
-sal_Bool operator==(const MasterPageDescriptor& rCandidate) const;
-sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const;
+bool operator==(const MasterPageDescriptor& rCandidate) const;
+bool operator!=(const MasterPageDescriptor& rCandidate) const;
const SdrPageProperties* getCorrectSdrPageProperties() const;
};
diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index 5191f73..bf8620c 100644
--- a/svx/inc/svx/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
@@ -112,7 +112,7 @@ public:
Rectangle GetVisibleArea() const;
// Is OutDev a printer?
-sal_Bool OutputToPrinter() const { return (OUTDEV_PRINTER ==
mrOutputDevice.GetOutDevType()); }
+bool OutputToPrinter() const { return (OUTDEV_PRINTER ==
mrOutputDevice.GetOutDevType()); }
// Is OutDev a window?
sal_Bool OutputToWindow() const { return (OUTDEV_WINDOW ==
mrOutputDevice.GetOutDevType()); }
@@ -121,7 +121,7 @@ public:
sal_Bool OutputToVirtualDevice() const { return (OUTDEV_VIRDEV ==
mrOutputDevice.GetOutDevType()); }
// Is OutDev a recording MetaFile?
-sal_Bool OutputToRecordingMetaFile() const;
+bool OutputToRecordingMetaFile() const;
// prepare PreRendering (evtl.)
void PreparePreRenderDevice();
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 5e42e5f..9a95ba1 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -114,13 +114,13 @@ public:
void SetGluePointEditMode(sal_Bool bOn=sal_True) {
SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
// Determine whether a text tool is activated
-sal_Bool IsTextTool() const;
+bool IsTextTool() const;
// Determine whether an object connector tool activated
-sal_Bool IsEdgeTool() const;
+bool IsEdgeTool() const;
// Determine whether a measurement tool activated
-sal_Bool IsMeasureTool() const;
+bool IsMeasureTool() const;
void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor);
void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const {
nInvent=nAktInvent; nIdent=nAktIdent; }
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index 47ac8a8..1997dfb 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -139,8 +139,7 @@ public:
sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
// Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten
Punkt.
-sal_Bool IsInsObjPointPossible() const;
-sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); }
+bool IsInsObjPointPossible() const;
sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return
ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
sal_Bool EndInsObjPoint(SdrCreateCmd eCmd)
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo59273.docx |binary
sw/qa/extras/ooxmlimport/data/n780645.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 10 +--
writerfilter/source/dmapper/DomainMapperTableManager.hxx |7 +
writerfilter/source/dmapper/TablePropertiesHandler.cxx |7 +
writerfilter/source/ooxml/model.xml | 19 ---
7 files changed, 44 insertions(+), 11 deletions(-)
New commits:
commit 7329df74df134a77d078f47d5c8b70d54c5d1edb
Author: Miklos Vajna
Date: Tue Mar 26 11:15:59 2013 +0100
fdo#59273 import w:tblLayout of DOCX tables
Change-Id: I9af50a4c176168e2794eaa9b0e8eaeb6b9d06b13
diff --git a/sw/qa/extras/ooxmlimport/data/fdo59273.docx
b/sw/qa/extras/ooxmlimport/data/fdo59273.docx
new file mode 100644
index 000..fcdfd77
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo59273.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a5b41e3..e3f1618 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -122,6 +122,7 @@ public:
void testFdo61343();
void testToolsLineNumbering();
void testFdo60922();
+void testFdo59273();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -195,6 +196,7 @@ void Test::run()
{"fdo61343.docx", &Test::testFdo61343},
{"tools-line-numbering.docx", &Test::testToolsLineNumbering},
{"fdo60922.docx", &Test::testFdo60922},
+{"fdo59273.docx", &Test::testFdo59273},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1288,6 +1290,16 @@ void Test::testFdo60922()
CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
getProperty(getRun(getParagraph(1), 1), "CharEscapementHeight"));
}
+void Test::testFdo59273()
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xTableRows(xTextTable->getRows(),
uno::UNO_QUERY);
+// Was 9997, so the 4th column had ~zero width
+CPPUNIT_ASSERT_EQUAL(sal_Int16(7498), getProperty<
uno::Sequence >(xTableRows->getByIndex(0),
"TableColumnSeparators")[2].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index be4e05f..1119709 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -53,6 +53,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_bOOXML( bOOXML ),
m_bPushCurrentWidth(false),
m_bRowSizeTypeInserted(false),
+m_nLayoutType(0),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -403,6 +404,7 @@ void DomainMapperTableManager::startLevel( )
m_aTablePositions.push_back( pNewPositionHandler );
m_nCell.push_back( 0 );
m_nTableWidth = 0;
+m_nLayoutType = 0;
// And push it back to the right level.
if (oCurrentWidth)
@@ -416,6 +418,7 @@ void DomainMapperTableManager::endLevel( )
m_aCellWidths.pop_back( );
m_nCell.pop_back( );
m_nTableWidth = 0;
+m_nLayoutType = 0;
DomainMapperTableManager_Base_t::endLevel( );
@@ -556,12 +559,13 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
-else if (pCellWidths->size() > 0)
+else if (pCellWidths->size() > 0 && m_nLayoutType ==
NS_ooxml::LN_Value_wordprocessingml_ST_TblLayout_fixed)
{
// If we're here, then the number of cells does not equal to the amount
// defined by the grid, even after taking care of
// gridSpan/gridBefore/gridAfter. Handle this by ignoring the grid and
-// providing the separators based on the provided cell widths.
+// providing the separators based on the provided cell widths, as long
+// as we have a fixed layout.
uno::Sequence< text::TableColumnSeparator >
aSeparators(pCellWidths->size() - 1);
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
sal_Int16 nSum = 0;
@@ -602,7 +606,7 @@ void DomainMapperTableManager::endOfRowAction()
void DomainMapperTableManager::clearData()
{
-m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0;
+m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth =
m_nLayoutType = 0;
m_sTableStyleName = OUString();
m_pTableStyleTextProperies.reset();
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapp
[Libreoffice-commits] core.git: 2 commits - logerrit
logerrit | 424 ++-
1 file changed, 234 insertions(+), 190 deletions(-)
New commits:
commit 15e9f568fdd73bd783e89283602b4017af373a39
Author: Bjoern Michaelsen
Date: Tue Mar 26 15:39:55 2013 +0100
add draft-submittal to logerrit and retab
Change-Id: I5f52d9c81c28c9a4b23eaf043e7b67b1fc6d82d9
diff --git a/logerrit b/logerrit
index 7700494..99d09ac 100755
--- a/logerrit
+++ b/logerrit
@@ -5,72 +5,81 @@ GERRITHOST=logerrit
GERRITURL=ssh://$GERRITHOST/core
get_SHA_for_change() {
- SHA=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep
ref|tail -1|cut -d: -f2`
+SHA=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep
ref|tail -1|cut -d: -f2`
}
get_REVISION_for_change() {
- REVISION=`ssh ${GERRITHOST?} gerrit query --all-approvals
change:$1|grep revision|tail -1|cut -d: -f2`
+REVISION=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep
revision|tail -1|cut -d: -f2`
}
ask_tristate() {
- case $1 in
- [yY] | [yY][Ee][Ss] | [+] )
- ANSWER=y
- ;;
- [nN] | [n|N][O|o] | [-] )
- ANSWER=n
- ;;
- [] )
- ANSWER=
- ;;
- * )
- echo "Please answer with either +,-,y,n,yes,no or the
empty string."
- exit 1
- ;;
- esac
+case $1 in
+[yY] | [yY][Ee][Ss] | [+] )
+ANSWER=y
+;;
+[nN] | [n|N][O|o] | [-] )
+ANSWER=n
+;;
+[] )
+ANSWER=
+;;
+* )
+echo "Please answer with either +,-,y,n,yes,no or the empty
string."
+exit 1
+;;
+esac
}
submit() {
- BRANCH=$1
- if test -z "$BRANCH"
- then
- BRANCH=`git symbolic-ref HEAD 2> /dev/null`
- BRANCH="${BRANCH##refs/heads/}"
- if test -z "$BRANCH"
- then
- echo "no branch specified, and could not guess
the current branch"
- exit 1
- fi
- echo "no branch specified, guessing current branch
$BRANCH"
- fi
- git push $GERRITURL HEAD:refs/for/$BRANCH
+TYPE=$1
+BRANCH=$2
+if test -z "$BRANCH"
+then
+BRANCH=`git symbolic-ref HEAD 2> /dev/null`
+BRANCH="${BRANCH##refs/heads/}"
+if test -z "$BRANCH"
+then
+echo "no branch specified, and could not guess the current
branch"
+exit 1
+fi
+echo "no branch specified, guessing current branch $BRANCH"
+fi
+git push $GERRITURL HEAD:refs/$TYPE/$BRANCH
}
case "$1" in
- help|--help|"")
- echo "Usage: ./logerrit subcommand [options]"
- echo "simple and basic tool to interact with LibreOffice gerrit"
- echo "subcommands:"
- echo " setup walking you though
your gerrit setup"
- echo " testtest your gerrit
setup"
- echo " --- for submitters:"
- echo " submit [BRANCH] submit your change
for review"
- echo " resubmit [BRANCH] create a new
Change-Id and submit your change for review"
- echo " (yes, this modifies
your last commit)"
- echo " nextchange [BRANCH] reset branch to the
remote to start with the next change"
- echo " --- for reviewers:"
- echo " checkout CHANGEID checkout the changes
for review"
- echo " pull CHANGEID pull (and merge) the
changes on current branch"
- echo " cherry-pick CHANGEIDcherry-pick the
change on current branch"
- echo " patch CHANGEID show the change as a
patch"
- echo " review [CHANGEID] interactively review
a change (current one if no changeid given)"
- echo " query query for changes
for review on project core"
- echo " "
- echo "advanced users should consider using git review instead:"
- echo "http://wiki.documentfoundation.org/Development/GitReview";
- exit
- ;;
+help|--help|"")
+echo "Usage: ./logerrit subcommand [options]"
+echo "simple and basic tool to interact with LibreOffice gerrit"
+echo "subcommands:"
+echo " setup walking you though your
gerrit
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/dociter.hxx |1 -
sc/source/core/data/dociter.cxx |7 ---
2 files changed, 8 deletions(-)
New commits:
commit e90d9b09e31565ec6b1488009b7075945b78ab22
Author: Kohei Yoshida
Date: Tue Mar 26 10:42:06 2013 -0400
This method no longer used. Good. Remove it.
Change-Id: I397dedd6c7388b350af0f93151fdf0160698acc7
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index d24c6ab..eb34633 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -76,7 +76,6 @@ public:
boolGetFirst();
boolGetNext();
-ScBaseCell* GetCell();
ScCellValue GetCellValue() const;
const ScPatternAttr*GetPattern();
voidGetPos( SCCOL& rCol, SCROW& rRow, SCTAB& rTab );
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 24fd2b3..9f7dd02 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -197,13 +197,6 @@ bool ScDocumentIterator::GetNext()
return GetThis();
}
-//
-
-ScBaseCell* ScDocumentIterator::GetCell()
-{
-return pCell;
-}
-
ScCellValue ScDocumentIterator::GetCellValue() const
{
ScCellValue aRet;
___
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' - e5/dafaf285f6406e3eca404214fb9c60ff47a4f1
e5/dafaf285f6406e3eca404214fb9c60ff47a4f1 |1 + 1 file changed, 1 insertion(+) New commits: commit 7fe0eabffeca418b447aaf0c3edefcba26458f6f Author: Michael Meeks Date: Tue Mar 26 14:46:14 2013 + Notes added by 'git notes add' diff --git a/e5/dafaf285f6406e3eca404214fb9c60ff47a4f1 b/e5/dafaf285f6406e3eca404214fb9c60ff47a4f1 new file mode 100644 index 000..af99c65 --- /dev/null +++ b/e5/dafaf285f6406e3eca404214fb9c60ff47a4f1 @@ -0,0 +1 @@ +merged as: 9fccdcaf810e543e28bca662300b5936ad7acf30 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Please just tell people to do './logerrit setup' to get started, also: gerrit draft changes
Hi all, during the Dresden Impress Sprint, I set up a few people for gerrit and realized that there is some needless hassle with it: mainly to dig out the wiki page for copy pasting the .ssh/config snipplet. So with: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=646b992ee306f83fa7175cc957cba9dc2277155a you can now tell people to run './logerrit setup' which should walk them through the steps (and that also shows a link to the wiki page, should there be need for more information.). Also gerrit now supports drafts: That is uploading changes that are only visible to those explicitly added as reviewers. I extended logerrit to have: ./logerrit submit-draft ./logerrit resubmit-draft which are the same as the submit/resubmit command in all other ways. HTH, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39468: Translated German comments
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2871 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2871 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85c8675881db9facdd543c02c846ec64642f8449 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gerhard öttl Gerrit-Reviewer: Michael Stahl Gerrit-Reviewer: Petr Mladek Gerrit-Reviewer: Thomas Arnhold ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Translate German comments, clean up some WS
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3057 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3057 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a6a99bb8efe8c3d10973c255040fbbf0f76f27d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Weissenbacher Gerrit-Reviewer: Michael Meeks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please just tell people to do './logerrit setup' to get started, also: gerrit draft changes
On Tue, 2013-03-26 at 15:52 +0100, Bjoern Michaelsen wrote: > during the Dresden Impress Sprint, I set up a few people for gerrit and > realized that there is some needless hassle with it: mainly to dig out the > wiki > page for copy pasting the .ssh/config snipplet. So with: Deeply sexy :-) > you can now tell people to run './logerrit setup' which should walk them Would you violently object if I dumbed it down yet further: if ~/.ssh/config is not there - just writing data into it. if ~/.ssh is not there - mentioning ssh-keygen :-) and so on ? Thanks ! Michael. -- michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: logerrit
logerrit |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ed4210d8e6cbf1b25cd1eb8666be6578cc45845 Author: Miklos Vajna Date: Tue Mar 26 16:21:37 2013 +0100 logerrit: kill copy-paste Change-Id: I2478ef0f886867c2d2247febf1b29b90fd32e5e7 diff --git a/logerrit b/logerrit index 99d09ac..68c254e 100755 --- a/logerrit +++ b/logerrit @@ -88,7 +88,7 @@ case "$1" in echo echo "Note that you need to register additional email addresses, if you want to" echo "commit from them. Additional emails must be confirmed with repling to the" -echo "invitation mail it sends you. Which user name did you choose? Sweetshark" +echo "invitation mail it sends you." echo read -p 'Which user name did you choose? ' GERRITUSER echo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#59273 import w:tblLayout of DOCX tables
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3058
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3058/1
fdo#59273 import w:tblLayout of DOCX tables
Also add missing to the bnc#780645 testcase
to avoid breaking the build.
(cherry picked from commits 7329df74df134a77d078f47d5c8b70d54c5d1edb and
4821d894f849a4939bbe6fb0a9a5ddd9e10b0467)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.hxx
Change-Id: I9af50a4c176168e2794eaa9b0e8eaeb6b9d06b13
---
A sw/qa/extras/ooxmlimport/data/fdo59273.docx
M sw/qa/extras/ooxmlimport/data/n780645.docx
M sw/qa/extras/ooxmlimport/ooxmlimport.cxx
M writerfilter/source/dmapper/DomainMapperTableManager.cxx
M writerfilter/source/dmapper/DomainMapperTableManager.hxx
M writerfilter/source/dmapper/TablePropertiesHandler.cxx
M writerfilter/source/ooxml/model.xml
7 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/sw/qa/extras/ooxmlimport/data/fdo59273.docx
b/sw/qa/extras/ooxmlimport/data/fdo59273.docx
new file mode 100644
index 000..fcdfd77
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/fdo59273.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/data/n780645.docx
b/sw/qa/extras/ooxmlimport/data/n780645.docx
index 12ffa38..35ad11f 100755
--- a/sw/qa/extras/ooxmlimport/data/n780645.docx
+++ b/sw/qa/extras/ooxmlimport/data/n780645.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 51ce241..aeda333 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -115,6 +115,7 @@
void testFdo59638();
void testFdo61343();
void testFdo60922();
+void testFdo59273();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -182,6 +183,7 @@
{"fdo59638.docx", &Test::testFdo59638},
{"fdo61343.docx", &Test::testFdo61343},
{"fdo60922.docx", &Test::testFdo60922},
+{"fdo59273.docx", &Test::testFdo59273},
};
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1140,6 +1142,16 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
getProperty(getRun(getParagraph(1), 1), "CharEscapementHeight"));
}
+void Test::testFdo59273()
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xTableRows(xTextTable->getRows(),
uno::UNO_QUERY);
+// Was 9997, so the 4th column had ~zero width
+CPPUNIT_ASSERT_EQUAL(sal_Int16(7498), getProperty<
uno::Sequence >(xTableRows->getByIndex(0),
"TableColumnSeparators")[2].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d81aea7..0298690 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -51,6 +51,7 @@
m_nTableWidth(0),
m_bOOXML( bOOXML ),
m_bPushCurrentWidth(false),
+m_nLayoutType(0),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -395,6 +396,7 @@
m_aTablePositions.push_back( pNewPositionHandler );
m_nCell.push_back( 0 );
m_nTableWidth = 0;
+m_nLayoutType = 0;
// And push it back to the right level.
if (oCurrentWidth)
@@ -408,6 +410,7 @@
m_aCellWidths.pop_back( );
m_nCell.pop_back( );
m_nTableWidth = 0;
+m_nLayoutType = 0;
DomainMapperTableManager_Base_t::endLevel( );
@@ -548,12 +551,13 @@
#endif
insertRowProps(pPropMap);
}
-else if (pCellWidths->size() > 0)
+else if (pCellWidths->size() > 0 && m_nLayoutType ==
NS_ooxml::LN_Value_wordprocessingml_ST_TblLayout_fixed)
{
// If we're here, then the number of cells does not equal to the amount
// defined by the grid, even after taking care of
// gridSpan/gridBefore/gridAfter. Handle this by ignoring the grid and
-// providing the separators based on the provided cell widths.
+// providing the separators based on the provided cell widths, as long
+// as we have a fixed layout.
uno::Sequence< text::TableColumnSeparator >
aSeparators(pCellWidths->size() - 1);
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
sal_Int16 nSum = 0;
@@ -593,7 +597,7 @@
void DomainMapperTableManager::clearData()
{
-m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0;
+m_nRow = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth =
m_nLayoutType = 0;
m_sTableStyleName = OUString();
m_pTab
[Libreoffice-commits] core.git: 6 commits - bin/module-deps.pl config_host.mk.in configure.ac connectivity/Library_postgresql-sdbc-impl.mk forms/Module_forms.mk postgresql/ExternalProject_postgresql.m
RepositoryModule_host.mk |2 +-
bin/module-deps.pl |2 +-
config_host.mk.in |2 ++
configure.ac | 11 +++
connectivity/Library_postgresql-sdbc-impl.mk | 13 -
forms/Module_forms.mk |2 --
postgresql/ExternalProject_postgresql.mk |3 +--
solenv/bin/modules/installer/epmfile.pm|6 +++---
solenv/bin/ooinstall |2 +-
solenv/gbuild/extensions/pre_MergedLibsList.mk |1 +
solenv/gbuild/gbuild.mk|2 +-
solenv/gbuild/partial_build.mk |7 ++-
12 files changed, 36 insertions(+), 17 deletions(-)
New commits:
commit a5b669de8431377c43909e30d9e9d01a18a5b58a
Author: Peter Foley
Date: Tue Mar 26 11:23:02 2013 -0400
make linkoo work in separate builddir
Change-Id: I1c9ca490716fc0dc5951bd032d54a102541087c7
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 31025b6..b9d52e5 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -130,7 +130,7 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) {
print "Installer finished\n";
if ($do_link && !$is_windows) {
-system("$ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT}") &&
+system("$ENV{SOLARENV}/bin/linkoo $path $ENV{BUILDDIR}") &&
die "linkoo failed: $!";
}
commit 207e370a167b7856346c1bff0c735cd2688e2e6e
Author: Peter Foley
Date: Tue Mar 26 11:10:25 2013 -0400
make partial_build work in separate builddir
Change-Id: Ib5290a3e76170946ce3a8aac113b01d1ec54fac5
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 9c7f3fb..8107bb2 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -1,8 +1,13 @@
ifeq ($(gb_Side),)
gb_Side:=host
endif
+
+ifeq (,$(BUILDDIR))
+BUILDDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST../..
+endif
+
ifeq ($(SOLARENV),)
-include $(dir $(realpath $(lastword
$(MAKEFILE_LIST../../config_$(gb_Side).mk
+include $(BUILDDIR)/config_$(gb_Side).mk
endif
gb_PARTIAL_BUILD := T
commit 469bb100d690d03b627dce48253a796a8f8cce68
Author: Peter Foley
Date: Tue Mar 26 11:02:52 2013 -0400
avoid getcwd redefined warning
Change-Id: Idd788dad8c2b5e2689a17b571104d0fe04accfd1
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 7ee6d13..4ea85b6 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -18,7 +18,7 @@
package installer::epmfile;
-use Cwd;
+use Cwd qw();
use installer::converter;
use installer::exiter;
use installer::files;
@@ -,7 +,7 @@ sub set_topdir_in_specfile
{
my ($changefile, $filename, $newepmdir) = @_;
-$newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only
absolute path allowed
+$newepmdir = Cwd::cwd() . $installer::globals::separator . $newepmdir; #
only absolute path allowed
# removing "%define _topdir", if existing
@@ -2070,7 +2070,7 @@ sub create_packages_without_epm
if ( $rpmversion >= 4 )
{
-my $dir = getcwd;
+my $dir = Cwd::getcwd;
my $buildroot = $dir . "/" . $epmdir . "buildroot/";
$buildrootstring = "--buildroot=$buildroot";
mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
commit ea360ff3ad9dac359f707cee5f0ca6548a7cd5d5
Author: Peter Foley
Date: Tue Mar 26 11:02:06 2013 -0400
add frm to Library_merged
Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index e28c9ae..a2be8b8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
fileaccess \
filter \
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
- forms \
+ $(call gb_Helper_optional,DBCONNECTIVITY,forms) \
formula \
fpicker \
framework \
diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk
index 7480767..bd64ac1 100644
--- a/forms/Module_forms.mk
+++ b/forms/Module_forms.mk
@@ -28,7 +28,6 @@
$(eval $(call gb_Module_Module,forms))
-ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,forms,\
AllLangResTarget_frm \
Library_frm \
@@ -38,6 +37,5 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\
JunitTest_forms_unoapi \
JunitTest_forms_complex \
))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 117c0df..2217014 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -45,6 +45,7 @@ gb_MERGEDLIBS := \
filterconfig \
for \
forui \
+ $(
Re: Please just tell people to do './logerrit setup' to get started, also: gerrit draft changes
Hi Michael, On Tue, Mar 26, 2013 at 03:11:37PM +, Michael Meeks wrote: > Would you violently object if I dumbed it down yet further: > > if ~/.ssh/config is not there - just writing data into it. No objection there, although the ~/.ssh/id_rsa path that it spits out is just a guess right now. > if ~/.ssh is not there - mentioning ssh-keygen :-) and so on ? ssh-keygen and all that jazz is already mentioned and linked on the gerrit setup page where you upload your key (linking to githubs excellent tutorial), so mentioning it again wont help much. What might help though would be for './logerrit setup': - to call ssh-keygen from the setup script itself, creating a ~/.ssh/id_logerrit key - then printing the public key for copy-paste in the gerrit setup page - and then tweak ~/.ssh/config (after all we now know the path to the key for sure) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source sw/source
sc/source/ui/view/tabvwsha.cxx | 28 +++-
sw/source/ui/wrtsh/move.cxx|7 +++
sw/source/ui/wrtsh/select.cxx |2 +-
3 files changed, 19 insertions(+), 18 deletions(-)
New commits:
commit 447a924c115a86e96e91b24d744af70f97efde72
Author: Lior Kaplan
Date: Tue Mar 26 17:54:09 2013 +0200
Translate German comments to English
Change-Id: Iaedc226f0dfad234bc67100e2845e09cc2976687
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 979591a..5d8e622 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -102,7 +102,7 @@ sal_Bool ScTabViewShell::GetFunction( String& rFuncStr,
sal_uInt16 nErrCode )
aStr += '0';
else
{
-// Anzahl im Standardformat, die anderen nach Cursorposition
+// Number in the standard format, the other on the cursor
position
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nNumFmt = 0;
if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2
)
@@ -137,7 +137,7 @@ sal_Bool ScTabViewShell::GetFunction( String& rFuncStr,
sal_uInt16 nErrCode )
-// Funktionen, die je nach Selektion disabled sind
+// Functions that are disabled, depending on the selection
// Default:
// SID_DELETE,
// SID_DELETE_CONTENTS,
@@ -223,8 +223,10 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
case SID_SEARCH_OPTIONS:
{
-sal_uInt16 nOptions = 0x; // alles erlaubt
-// wenn ReadOnly, kein
Ersetzen:
+// Anything goes
+sal_uInt16 nOptions = 0x;
+
+// No replacement if ReadOnly
if (GetViewData()->GetDocShell()->IsReadOnly())
nOptions &= ~( SEARCH_OPTIONS_REPLACE |
SEARCH_OPTIONS_REPLACE_ALL );
rSet.Put( SfxUInt16Item( nWhich, nOptions ) );
@@ -243,7 +245,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case SID_CURRENTTAB:
-// Tabelle fuer Basic ist 1-basiert
+// Table for Basic is 1-based
rSet.Put( SfxUInt16Item( nWhich,
static_cast(GetViewData()->GetTabNo()) + 1 ) );
break;
@@ -272,7 +274,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
case FID_RESET_PRINTZOOM:
{
-// disablen, wenn schon Default eingestellt
+// disable if already set to default
String aStyleName = pDoc->GetPageStyle( nTab );
ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool();
@@ -441,13 +443,13 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
break;
case SID_FORMATPAGE:
-//! bei geschuetzten Tabellen ???
+// in protected tables
if ( pDocShell && ( pDocShell->IsReadOnly() ||
pDocShell->IsDocShared() ) )
rSet.DisableItem( nWhich );
break;
case SID_PRINTPREVIEW:
-// Toggle-Slot braucht einen State
+// Toggle slot needs a State
rSet.Put( SfxBoolItem( nWhich, false ) );
break;
@@ -480,7 +482,7 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest&
rReq, sal_uInt16 nTabPage
pOldAttrs->GetItemSet() );
-// Umrandungs-Items holen und in den Set packen:
+// Get border items and put them in the set:
GetSelectionFrame( aLineOuter, aLineInner );
//Fix border incorrect for RTL fdo#62399
if( pDoc->IsLayoutRTL( GetViewData()->GetTabNo() ) )
@@ -502,7 +504,7 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest&
rReq, sal_uInt16 nTabPage
pOldSet->Put( aLineInner );
-// NumberFormat Value aus Value und Language erzeugen und eintueten
+// Generate NumberFormat Value from Value and Language and box it.
pOldSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT,
pOldAttrs->GetNumberFormat( pDoc->GetFormatTable() ) ) );
@@ -708,9 +710,9 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust(
SvxCellHorJustify eJust )
void ScTabViewShell::ExecuteSave( SfxRequest& rReq )
{
-// nur SID_SAVEDOC / SID_SAVEASDOC
+// only SID_SAVEDOC / SID_SAVEASDOC
-// Eingabe auf jeden Fall abschliessen, auch wenn eine Formel bearbeitet
wird
+// Finish entering in any case, even if a formula is being processed
SC_MOD()->InputEnterHandler();
if ( GetViewData()->GetDocShell()->IsDocShared() )
@@ -718,7 +720,7 @@ void ScTabViewShell::ExecuteSave( SfxRequest& rReq )
GetViewData()->GetDocShell()->SetDocumentModified();
}
-// ansonsten normal weiter
+// otherwise a
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/cell.hxx |1
sc/inc/cellvalue.hxx | 56 ++
sc/inc/column.hxx |1
sc/inc/document.hxx | 11 +
sc/inc/table.hxx |1
sc/source/core/data/cellvalue.cxx | 309 --
sc/source/core/data/column3.cxx | 12 +
sc/source/core/data/document.cxx |8
sc/source/core/data/table2.cxx|7
9 files changed, 326 insertions(+), 80 deletions(-)
New commits:
commit 0aa3d9c489effcc9ab01946ab9cea846bbab1c39
Author: Kohei Yoshida
Date: Tue Mar 26 12:00:43 2013 -0400
Add ScRefCellValue, which is ScCellValue without copied value.
It directly points to the original cell value instance.
Change-Id: I638ec8b931873d237871b6d8fa9f0e1277520d0f
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 236ad43..0b78f98 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -175,6 +175,7 @@ public:
inline void SetString( const rtl::OUString& rString ) { maString =
rString; }
inline constrtl::OUString& GetString() const { return maString; }
+const OUString* GetStringPtr() const { return &maString; }
private:
rtl::OUString maString;
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 9dd3a9a..7998898 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -19,7 +19,8 @@ class ScBaseCell;
/**
* Store arbitrary cell value of any kind. It only stores cell value and
- * nothing else.
+ * nothing else. It creates a copy of the original cell value, and manages
+ * the life cycle of the copied value.
*/
struct SC_DLLPUBLIC ScCellValue
{
@@ -78,6 +79,59 @@ struct SC_DLLPUBLIC ScCellValue
void swap( ScCellValue& r );
};
+/**
+ * This is very similar to ScCellValue, except that it points to the
+ * original value instead of copying it. As such, don't hold an instance of
+ * this class any longer than necessary.
+ */
+struct SC_DLLPUBLIC ScRefCellValue
+{
+CellType meType;
+union {
+double mfValue;
+const OUString* mpString;
+const EditTextObject* mpEditText;
+ScFormulaCell* mpFormula;
+};
+
+ScRefCellValue();
+ScRefCellValue( double fValue );
+ScRefCellValue( const OUString* pString );
+ScRefCellValue( const EditTextObject* pEditText );
+ScRefCellValue( ScFormulaCell* pFormula );
+ScRefCellValue( const ScRefCellValue& r );
+~ScRefCellValue();
+
+void clear();
+
+/**
+ * Take cell value from specified position in specified document.
+ */
+void assign( ScDocument& rDoc, const ScAddress& rPos );
+
+/**
+ * TODO: Remove this later.
+ */
+void assign( ScBaseCell& rCell );
+
+/**
+ * Set cell value at specified position in specified document.
+ */
+void commit( ScDocument& rDoc, const ScAddress& rPos ) const;
+
+bool hasString() const;
+
+bool hasNumeric() const;
+
+bool isEmpty() const;
+
+bool equalsWithoutFormat( const ScRefCellValue& r ) const;
+
+ScRefCellValue& operator= ( const ScRefCellValue& r );
+
+void swap( ScRefCellValue& r );
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f25dc78..ac329b2 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -272,6 +272,7 @@ public:
voidSetError( SCROW nRow, const sal_uInt16 nError);
voidGetString( SCROW nRow, rtl::OUString& rString ) const;
+const OUString* GetStringCell( SCROW nRow ) const;
voidGetInputString( SCROW nRow, rtl::OUString& rString ) const;
double GetValue( SCROW nRow ) const;
const EditTextObject* GetEditText( SCROW nRow ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 70c5620..892d18f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -802,6 +802,17 @@ public:
SC_DLLPUBLIC OUString GetString( SCCOL nCol, SCROW nRow, SCTAB nTab )
const;
OUString GetString( const ScAddress& rPos ) const;
+
+/**
+ * Return a pointer to the string object stored in string cell.
+ *
+ * @param rPos cell position.
+ *
+ * @return pointer to the string object stored in string cell, or NULL if
+ * the cell at specified position is not a string cell. Note that
+ * it returns NULL even for a edit cell.
+ */
+const OUString* GetStringCell( const ScAddress& rPos ) const;
SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB
nTab, String& rString );
SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB
nTab, rtl::OUString& rString );
sal_uInt16 GetStringForFormula( const ScAddress& rPos,
rtl::OUString& rString );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 461da522..0a12ead 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -318,6 +318,7 @@ public:
voidSetError( SCCOL nCol, SCROW nRow, sal
[Libreoffice-commits] core.git: apache-commons/ExternalProject_apache_commons_httpclient.mk apache-commons/Package_apache_commons_codec.mk apache-commons/Package_apache_commons_lang.mk apache-commons/
apache-commons/ExternalProject_apache_commons_httpclient.mk |2 apache-commons/Package_apache_commons_codec.mk |2 apache-commons/Package_apache_commons_lang.mk |2 apache-commons/UnpackedTarball_apache_commons_httpclient.mk |5 apache-commons/patches/codec.patch | 23 +- apache-commons/patches/httpclient.patch | 119 apache-commons/patches/httpclient_no_javadoc.patch | 11 + download.lst|4 swext/Extension_wiki-publisher.mk |4 9 files changed, 155 insertions(+), 17 deletions(-) New commits: commit adda54b5211916f9b442e8ac7d82cc861bdde54d Author: Pedro Giffuni Date: Wed May 9 22:22:11 2012 + Update Apache Commons Update commons-codec to version 1.6. Update commons-lang to version 2.4. Patch common-httpclient to avoid building issues with OpenJDK-7. These versions maintain ABI compatibility while using features from newer Java versions and have been tested on the FreeBSD port. Change-Id: I6aec2b6d22fc3335ffbdda9558f475313ef53c85 diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk index 5b67c35..aaf1520 100644 --- a/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) : -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar" \ - -Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.3.jar" \ + -Dcommons-codec.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar" \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ diff --git a/apache-commons/Package_apache_commons_codec.mk b/apache-commons/Package_apache_commons_codec.mk index aaf3b7f..65d302b 100644 --- a/apache-commons/Package_apache_commons_codec.mk +++ b/apache-commons/Package_apache_commons_codec.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,apache_commons_codec_inc,$(call gb_UnpackedTarb $(eval $(call gb_Package_use_external_project,apache_commons_codec_inc,apache_commons_codec)) -$(eval $(call gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.3.jar,dist/commons-codec-1.3.jar)) +$(eval $(call gb_Package_add_file,apache_commons_codec_inc,bin/commons-codec-1.6.jar,dist/commons-codec-1.6-SNAPSHOT.jar)) # vim: set noet sw=4 ts=4: diff --git a/apache-commons/Package_apache_commons_lang.mk b/apache-commons/Package_apache_commons_lang.mk index 8f93b9be..a9c1eb3 100644 --- a/apache-commons/Package_apache_commons_lang.mk +++ b/apache-commons/Package_apache_commons_lang.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,apache_commons_lang_inc,$(call gb_UnpackedTarba $(eval $(call gb_Package_use_external_project,apache_commons_lang_inc,apache_commons_lang)) -$(eval $(call gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.3.jar,dist/commons-lang-2.3.jar)) +$(eval $(call gb_Package_add_file,apache_commons_lang_inc,bin/commons-lang-2.4.jar,dist/commons-lang-2.4.jar)) # vim: set noet sw=4 ts=4: diff --git a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk index a68c071..6139a94 100644 --- a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk +++ b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk @@ -11,4 +11,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient)) $(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL))) +$(eval $(call gb_UnpackedTarball_add_patches,apache_commons_httpclient,\ + apache-commons/patches/httpclient.patch \ + apache-commons/patches/httpclient_no_javadoc.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch index ffbcb57..7a9b489 100644 --- a/apache-commons/patches/codec.patch +++ b/apache-commons/patches/codec.patch @@ -1,17 +1,20 @@ misc/build/commons-codec-1.3/build.xml-old 2008-01-31 15:28:58.0 +0100 -+++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.0 +0100 -@@ -90,14 +90,12 @@ +--- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05 22:12:32.0 -0500 misc/build/commo
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/867d46563915bce0439c2d6a741175baadf6d0
ef/867d46563915bce0439c2d6a741175baadf6d0 |1 + 1 file changed, 1 insertion(+) New commits: commit 440b487a0d1b34e690d50da506c4ad0d669e5ab4 Author: Fridrich Å trba Date: Tue Mar 26 17:14:24 2013 +0100 Notes added by 'git notes add' diff --git a/ef/867d46563915bce0439c2d6a741175baadf6d0 b/ef/867d46563915bce0439c2d6a741175baadf6d0 new file mode 100644 index 000..719549e --- /dev/null +++ b/ef/867d46563915bce0439c2d6a741175baadf6d0 @@ -0,0 +1 @@ +merged as: adda54b5211916f9b442e8ac7d82cc861bdde54d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] Use an 8bpp virtual device (instead of a 1bpp one) in sw and...
Tor Lillqvist has abandoned this change. Change subject: Use an 8bpp virtual device (instead of a 1bpp one) in sw and sc .. Patch Set 3: Abandoned -- To view, visit https://gerrit.libreoffice.org/2979 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia34927cf728d4be05a31e88b7da78200d0b799ba Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist Gerrit-Reviewer: Christoph Brill Gerrit-Reviewer: Tor Lillqvist ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2e/d8ccfd4348df1e860477cdd093d780ca02e5da
2e/d8ccfd4348df1e860477cdd093d780ca02e5da |1 + 1 file changed, 1 insertion(+) New commits: commit 1e53706339af59a1f4bdbb36da2f89dd18cb13c0 Author: Fridrich Å trba Date: Tue Mar 26 17:16:08 2013 +0100 Notes added by 'git notes add' diff --git a/2e/d8ccfd4348df1e860477cdd093d780ca02e5da b/2e/d8ccfd4348df1e860477cdd093d780ca02e5da new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/2e/d8ccfd4348df1e860477cdd093d780ca02e5da @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Fix template manager item selection behaviour with mouse.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3053 -- To view, visit https://gerrit.libreoffice.org/3053 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf63454973b403eea1cc583fce3a78c5594d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez Gerrit-Reviewer: Bosdonnat Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Syncronize thumbnails ids with SfxDocumentTemplates when mov...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3054 -- To view, visit https://gerrit.libreoffice.org/3054 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ee17e00f769ca16f566b1397d09b76a09273912 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez Gerrit-Reviewer: Bosdonnat Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Merge TemplateView into TemplateAbstractView class.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3051 -- To view, visit https://gerrit.libreoffice.org/3051 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafc246eeff4c50c12ac9ebec9fe95dcc84991e9e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez Gerrit-Reviewer: Bosdonnat Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Deselect thumbnailview items when clearing the view.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3052 -- To view, visit https://gerrit.libreoffice.org/3052 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8aa3f61d3ec7a8bf6195c5480b82d1dc1ecabc34 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rafael Dominguez Gerrit-Reviewer: Bosdonnat Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - config_host.mk.in connectivity/inc connectivity/source dbaccess/source i18npool/source l10ntools/source Makefile.in solenv/gbuild
Makefile.in |2 +-
config_host.mk.in|1 -
connectivity/inc/connectivity/CommonTools.hxx|3 ++-
connectivity/inc/connectivity/FValue.hxx |1 +
connectivity/source/commontools/CommonTools.cxx |1 +
dbaccess/source/filter/xml/xmlfilter.cxx |1 +
dbaccess/source/ui/dlg/ConnectionPage.cxx|1 +
i18npool/source/textconversion/textconversion_ko.cxx |4 +---
l10ntools/source/cfglex.l|2 +-
l10ntools/source/srclex.l|2 +-
l10ntools/source/xrmlex.l|2 +-
solenv/gbuild/platform/com_GCC_defs.mk |4 ++--
solenv/gbuild/platform/com_MSC_defs.mk |4 ++--
13 files changed, 15 insertions(+), 13 deletions(-)
New commits:
commit cd235e389d6ea2c9d9c8b15722659d9c3d5bf0a3
Author: Stephan Bergmann
Date: Tue Mar 26 17:21:14 2013 +0100
No (more/apparent) need for LIBO_WERROR
Change-Id: I8483047631f512513cae017fdbb2dee77ce0f52f
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx
b/i18npool/source/textconversion/textconversion_ko.cxx
index f20a1e6..d9fe16c 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -137,7 +137,6 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
const sal_uInt16* (*getHanja2HangulIndex)() = (const sal_uInt16* (*)())
getFunctionBySymbol("getHanja2HangulIndex");
const sal_Unicode* (*getHanja2HangulData)() = (const sal_Unicode* (*)())
getFunctionBySymbol("getHanja2HangulData");
#else
-#ifdef LIBO_WERROR
#pragma GCC diagnostic push
#ifdef __clang__
#pragma GCC diagnostic warning "-Wbool-conversions"
@@ -145,7 +144,6 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
#pragma GCC diagnostic warning "-Waddress"
#endif
#endif
-#endif
if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount &&
getHangul2HanjaData) {
ch = aText[nStartPos];
const Hangul_Index *Hangul_ko = getHangul2HanjaIndex();
@@ -192,7 +190,7 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
}
delete[] newStr;
}
-#if defined(DISABLE_DYNLOADING) && defined(LIBO_WERROR)
+#if defined(DISABLE_DYNLOADING)
#pragma GCC diagnostic pop
#endif
return output;
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index d20b9f7..a695a2f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -100,8 +100,8 @@ endif
endif
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
-gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CFLAGS_WERROR := -Werror
+gb_CXXFLAGS_WERROR := -Werror
endif
ifeq ($(MERGELIBS),TRUE)
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2466422..e8488ef 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -233,8 +233,8 @@ gb_STDLIBS := \
advapi32.lib \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
-gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR
+gb_CFLAGS_WERROR := -WX
+gb_CXXFLAGS_WERROR := -WX
endif
ifeq ($(MERGELIBS),TRUE)
commit 6ecf41eb2dcc4f15399cc8dc78547a517294781f
Author: Stephan Bergmann
Date: Tue Mar 26 17:21:01 2013 +0100
Typo __SINPRO_CC -> __SUNPRO_CC
Change-Id: I831abe80f9b4b160f4af10a16f4d45cc68fa3bb6
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index ea9e7b4..0ecb314 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -48,7 +48,7 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SINPRO_CC
+#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 6716b1b..2826dce 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -49,7 +49,7 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SINPRO_CC
+#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 7513edd..a2b5c0c 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -48,7 +48,7 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SINPRO_CC
+#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(p
[PATCH libreoffice-4-0] fix iint/iiint import from docx math
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3059 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/3059/1 fix iint/iiint import from docx math Use the correct LO names for the symbols. Change-Id: I4da760fb84e6f9ca811e13061341f9a993342c29 --- M starmath/source/ooxmlimport.cxx 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 0b1beda..e3a48ca 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -530,10 +530,10 @@ ret = "int"; break; case MS_IINT: -ret = "liint"; +ret = "iint"; break; case MS_IIINT: -ret = "liiint"; +ret = "iiint"; break; case MS_LINT: ret = "lint"; -- To view, visit https://gerrit.libreoffice.org/3059 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4da760fb84e6f9ca811e13061341f9a993342c29 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] m:nor and m:lit math docx tags lead to quoting
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3060
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3060/1
m:nor and m:lit math docx tags lead to quoting
The meaning should not be exactly the same, but it looks like there's
no better way to express this (or rather quoting means both).
Change-Id: I024ce6c89667a69f685bb84d768095100b0090b1
---
M starmath/source/ooxmlimport.cxx
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index e3a48ca..648f808 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -570,11 +570,21 @@
OUString SmOoxmlImport::handleR()
{
stream.ensureOpeningTag( M_TOKEN( r ));
-if( XmlStream::Tag rPr = stream.checkOpeningTag( OOX_TOKEN( doc, rPr )))
-{ // TODO
-//stream.checkOpeningTag( OOX_TOKEN( doc, rFonts ));
-//stream.ensureClosingTag( OOX_TOKEN( doc, rFonts ));
-stream.ensureClosingTag( OOX_TOKEN( doc, rPr ));
+bool normal = false;
+bool literal = false;
+if( XmlStream::Tag rPr = stream.checkOpeningTag( M_TOKEN( rPr )))
+{
+if( XmlStream::Tag litTag = stream.checkOpeningTag( M_TOKEN( lit )))
+{
+literal = litTag.attribute( M_TOKEN( val ), true );
+stream.ensureClosingTag( M_TOKEN( lit ));
+}
+if( XmlStream::Tag norTag = stream.checkOpeningTag( M_TOKEN( nor )))
+{
+normal = norTag.attribute( M_TOKEN( val ), true );
+stream.ensureClosingTag( M_TOKEN( nor ));
+}
+stream.ensureClosingTag( M_TOKEN( rPr ));
}
OUString text;
while( !stream.atEnd() && stream.currentToken() != CLOSING(
stream.currentToken()))
@@ -597,6 +607,8 @@
}
}
stream.ensureClosingTag( M_TOKEN( r ));
+if( normal || literal )
+text = "\"" + text + "\"";
return text.replaceAll("{", "\\{").replaceAll("}", "\\}");
}
--
To view, visit https://gerrit.libreoffice.org/3060
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I024ce6c89667a69f685bb84d768095100b0090b1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luboš Luňák
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] export quoted parts of math formulas properly to docx mathml
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3061
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3061/1
export quoted parts of math formulas properly to docx mathml
Change-Id: I7950ff78c23e5e6c58ffceaa9c2a2f52e3408b26
---
M starmath/source/ooxmlexport.cxx
1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index a918cb2..22f813c 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -75,6 +75,13 @@
{
m_pSerializer->startElementNS( XML_m, XML_r, FSEND );
+if( pNode->GetToken().eType == TTEXT ) // literal text (in quotes)
+{
+m_pSerializer->startElementNS( XML_m, XML_rPr, FSEND );
+m_pSerializer->singleElementNS( XML_m, XML_lit, FSEND );
+m_pSerializer->singleElementNS( XML_m, XML_nor, FSEND );
+m_pSerializer->endElementNS( XML_m, XML_rPr );
+}
if( version == ECMA_DIALECT )
{ // HACK: MSOffice2007 does not import characters properly unless this
font is explicitly given
m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
--
To view, visit https://gerrit.libreoffice.org/3061
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7950ff78c23e5e6c58ffceaa9c2a2f52e3408b26
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luboš Luňák
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UI_cui.mk
cui/UI_cui.mk |1
cui/source/options/optfltr.cxx | 88 ++---
cui/source/options/optfltr.hrc | 13 --
cui/source/options/optfltr.hxx | 19 +-
cui/source/options/optfltr.src | 94 --
cui/uiconfig/ui/optfltrpage.ui | 260 +
6 files changed, 311 insertions(+), 164 deletions(-)
New commits:
commit 2c1da7f081b581472df761384743c9ca223ba0a3
Author: Krisztian Pinter
Date: Sun Mar 24 12:50:00 2013 +0100
convert half of optfltr.src to .ui
Converted the "VBA Properties" half of optfltr.src to optfltrpage.ui.
Change-Id: Ie200377f2956aa243b1be859eb52972b79e9dc66
Reviewed-on: https://gerrit.libreoffice.org/2961
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index fff3fda..c3b6fe7 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/optaccessibilitypage \
cui/uiconfig/ui/optadvancedpage \
cui/uiconfig/ui/optappearancepage \
+ cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/optmemorypage \
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index df2d57e..2271fab 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -39,23 +39,19 @@ enum MSFltrPg2_CheckBoxEntries {
// ---
OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
-: SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
-aMSWordGB ( this, CUI_RES( GB_WORD) ),
-aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ),
-aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ),
-aWBasicStgCB( this, CUI_RES( CB_WBAS_STG ) ),
-aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ),
-aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ),
-aEBasicExectblCB( this, CUI_RES( CB_EBAS_EXECTBL ) ),
-aEBasicStgCB( this, CUI_RES( CB_EBAS_STG ) ),
-aMSPPointGB ( this, CUI_RES( GB_PPOINT) ),
-aPBasicCodeCB ( this, CUI_RES( CB_PBAS_CODE ) ),
-aPBasicStgCB( this, CUI_RES( CB_PBAS_STG ) )
+: SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", rSet )
{
-FreeResource();
-
-aWBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage,
LoadWordBasicCheckHdl_Impl ) );
-aEBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage,
LoadExcelBasicCheckHdl_Impl ) );
+get( aWBasicCodeCB , "wo_basic");
+get( aWBasicWbctblCB, "wo_exec" );
+get( aWBasicStgCB , "wo_saveorig" );
+get( aEBasicCodeCB , "ex_basic");
+get( aEBasicExectblCB , "ex_exec" );
+get( aEBasicStgCB , "ex_saveorig" );
+get( aPBasicCodeCB , "pp_basic");
+get( aPBasicStgCB , "pp_saveorig" );
+
+aWBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage,
LoadWordBasicCheckHdl_Impl ) );
+aEBasicCodeCB->SetClickHdl( LINK( this, OfaMSFilterTabPage,
LoadExcelBasicCheckHdl_Impl ) );
}
OfaMSFilterTabPage::~OfaMSFilterTabPage()
@@ -64,13 +60,13 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage()
IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl)
{
-aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() );
+aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() );
return 0;
}
IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl)
{
-aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() );
+aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
return 0;
}
@@ -85,23 +81,23 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
sal_Bool bFlag;
-if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
+if( aWBasicCodeCB->GetSavedValue() != (bFlag = aWBasicCodeCB->IsChecked()))
rOpt.SetLoadWordBasicCode( bFlag );
-if( aWBasicWbctblCB.GetSavedValue() != (bFlag =
aWBasicWbctblCB.IsChecked()))
+if( aWBasicWbctblCB->GetSavedValue() != (bFlag =
aWBasicWbctblCB->IsChecked()))
rOpt.SetLoadWordBasicExecutable( bFlag );
-if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
+if( aWBasicStgCB->GetSavedValue() != (bFlag = aWBasicStgCB->IsChecked()))
rOpt.SetLoadWordBasicStorage( bFlag );
-if( aEBasicCodeCB.GetSavedValue() != (bFlag = aEBasicCodeCB.IsChecked()))
+if( aEBasicCodeCB->GetSavedValue() != (bFlag = aEBasicCodeCB->IsChecked()))
rOpt.SetLoadExcelBasicCode( bFlag );
-if( aEBasicExectblCB.GetSavedValue() != (bFlag =
aEBasicExectblCB.IsChecked()))
+if( aEBasicExectblCB->GetSavedValue() != (bFlag =
aEBasicExectblCB->IsChecked()))
rOpt.SetLoadExcelBasicExecutable( bFlag );
-if( aEBasicStgCB.GetSavedValue() != (
[PUSHED] convert half of optfltr.src to .ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2961 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2961 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie200377f2956aa243b1be859eb52972b79e9dc66 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/chgtrack.hxx |3
sc/inc/dociter.hxx | 12 --
sc/source/core/data/dociter.cxx | 187 +--
sc/source/core/tool/chgtrack.cxx |8 -
sc/source/core/tool/interpr1.cxx |4
sc/source/core/tool/interpr5.cxx |2
6 files changed, 59 insertions(+), 157 deletions(-)
New commits:
commit 6a6f74a9d5fa61ccdd97bffd46c13fd799a8d52e
Author: Kohei Yoshida
Date: Tue Mar 26 12:35:36 2013 -0400
By using ScRefCellValue we can remove some duplicated code.
Change-Id: I75652172033e4ce00ac239e85d835c7cc9256fe2
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index b30cf1b..6b06c22 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -37,7 +37,6 @@
class ScDocument;
class ScFormulaCell;
-class ScCellIterator;
enum ScChangeActionType
{
@@ -800,7 +799,7 @@ public:
rtl::OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const;
static ScChangeActionContentCellType GetContentCellType( const
ScCellValue& rCell );
-static ScChangeActionContentCellType GetContentCellType( const
ScCellIterator& rIter );
+static ScChangeActionContentCellType GetContentCellType( const
ScRefCellValue& rIter );
// NewCell
bool IsMatrixOrigin() const;
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index eb34633..4f3ab26 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -24,6 +24,7 @@
#include
#include "global.hxx"
#include "scdllapi.h"
+#include "cellvalue.hxx"
#include
@@ -45,7 +46,6 @@ struct ScQueryParam;
struct ScDBQueryParamInternal;
struct ScDBQueryParamMatrix;
class ScFormulaCell;
-class ScCellValue;
class ScDocumentIterator// walk through all non-empty cells
{
@@ -222,13 +222,7 @@ private:
SCSIZE mnIndex;
bool mbSubTotal;
-CellType meCurType;
-OUString maCurString;
-union {
-double mfCurValue;
-const EditTextObject* mpCurEditText; // points to the original.
-ScFormulaCell* mpCurFormula; // points to the original.
-};
+ScRefCellValue maCurCell;
void init();
bool getCurrent();
@@ -245,9 +239,11 @@ public:
const ScFormulaCell* getFormulaCell() const;
double getValue() const;
ScCellValue getCellValue() const;
+ScRefCellValue getRefCellValue() const;
bool hasString() const;
bool hasNumeric() const;
+bool hasEmptyData() const;
bool isEmpty() const;
bool equalsWithoutFormat( const ScAddress& rPos ) const;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 9f7dd02..adb7787 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -943,9 +943,7 @@ ScCellIterator::ScCellIterator( ScDocument* pDoc, const
ScRange& rRange, bool bS
maStartPos(rRange.aStart),
maEndPos(rRange.aEnd),
mnIndex(0),
-mbSubTotal(bSTotal),
-meCurType(CELLTYPE_NONE),
-mfCurValue(0.0)
+mbSubTotal(bSTotal)
{
init();
}
@@ -996,7 +994,7 @@ bool ScCellIterator::getCurrent()
maCurPos.IncTab();
if (maCurPos.Tab() > maEndPos.Tab())
{
-meCurType = CELLTYPE_NONE;
+maCurCell.clear();
return false; // Over and out
}
}
@@ -1021,26 +1019,26 @@ bool ScCellIterator::getCurrent()
else
{
// Found it!
-meCurType = pCell->GetCellType();
-switch (meCurType)
+maCurCell.meType = pCell->GetCellType();
+switch (maCurCell.meType)
{
case CELLTYPE_VALUE:
-mfCurValue = static_cast(pCell)->GetValue();
+maCurCell.mfValue = static_cast(pCell)->GetValue();
break;
case CELLTYPE_STRING:
-maCurString = static_cast(pCell)->GetString();
+maCurCell.mpString = static_cast(pCell)->GetStringPtr();
break;
case CELLTYPE_EDIT:
-mpCurEditText = static_cast(pCell)->GetData();
+maCurCell.mpEditText = static_cast(pCell)->GetData();
break;
case CELLTYPE_FORMULA:
-mpCurFormula = static_cast(pCell);
+maCurCell.mpFormula =
static_cast(pCell);
break;
default:
-meCurType = CELLTYPE_NONE;
+maCurCell.meType = CELLTYPE_NONE;
}
-if (meCurType != CELLTYPE_NONE)
+if (maCurCell.meType != CELLTYPE_NONE)
return true;
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/templatedlg.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit de30e4c9164f5ad6e8f04218810ba997dc930410
Author: Stephan Bergmann
Date: Tue Mar 26 17:35:01 2013 +0100
quickfix
Change-Id: Ida36d96982d869553452c8240da7dec363cee4b4
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 6899cf6..4250fe1 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -846,7 +846,7 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
if (aFiles.hasElements())
{
-std::set::const_iterator pIter;
+std::set::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end();
++pIter)
{
OUString aTemplateList;
@@ -895,7 +895,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
{
sal_uInt16 i = 1;
-std::set::const_iterator pIter =
maSelTemplates.begin();
+std::set::const_iterator pIter =
maSelTemplates.begin();
for (pIter = maSelTemplates.begin(); pIter !=
maSelTemplates.end(); ++pIter, ++i)
{
const TemplateSearchViewItem *pItem = static_cast(*pIter);
@@ -927,7 +927,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
sal_uInt16 i = 1;
sal_uInt16 nRegionItemId = maView->getCurRegionId() + 1;
-std::set::const_iterator pIter =
maSelTemplates.begin();
+std::set::const_iterator pIter =
maSelTemplates.begin();
for (pIter = maSelTemplates.begin(); pIter !=
maSelTemplates.end(); ++pIter, ++i)
{
const TemplateViewItem *pItem = static_cast(*pIter);
@@ -1014,7 +1014,7 @@ void SfxTemplateManagerDlg::OnTemplateEdit ()
aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
uno::Reference< XStorable > xStorable;
-std::set::const_iterator pIter;
+std::set::const_iterator pIter;
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();
++pIter)
{
const TemplateViewItem *pItem = static_cast(*pIter);
@@ -1053,7 +1053,7 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
if (mpSearchView->IsVisible())
{
-std::set::const_iterator pIter;
+std::set::const_iterator
pIter;
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
{
const TemplateSearchViewItem *pItem =
@@ -1087,7 +1087,7 @@ void SfxTemplateManagerDlg::OnTemplateDelete ()
}
else
{
-std::set::const_iterator pIter;
+std::set::const_iterator
pIter;
for (pIter = maSelTemplates.begin(); pIter != maSelTemplates.end();)
{
if
(maView->removeTemplate((*pIter)->mnId,maView->getCurRegionId()+1))
@@ -1158,7 +1158,7 @@ void SfxTemplateManagerDlg::OnFolderDelete()
OUString aFolderList;
-std::set::const_iterator pIter;
+std::set::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end();)
{
if (maView->removeRegion((*pIter)->mnId))
@@ -1238,7 +1238,7 @@ void SfxTemplateManagerDlg::OnTemplateSaveAs()
}
else
{
-std::set::const_iterator pIter;
+std::set::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter !=
maSelFolders.end(); ++pIter)
{
TemplateContainerItem *pItem =
(TemplateContainerItem*)(*pIter);
@@ -1370,7 +1370,7 @@ void SfxTemplateManagerDlg::localMoveTo(sal_uInt16
nMenuId)
{
OUString aTemplateList;
-std::set::const_iterator pIter;
+std::set::const_iterator pIter;
for (pIter = maSelFolders.begin(); pIter != maSelFolders.end();
++pIter)
{
if (aTemplateList.isEmpty())
@@ -1414,7 +1414,7 @@ void SfxTemplateManagerDlg::remoteMoveTo(const sal_uInt16
nMenuId)
{
OUString aTemplateList;
-std::set::const_iterator aIter;
+std::set::const_iterator
aIter;
for (aIter = maSelTemplates.begin(); aIter != maSelTemplates.end();
++aIter)
{
const TemplateSearchViewItem *pItem =
@@ -1470,7 +1470,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16
nMenuId)
// Move templates to desired folder if for some reason move fails
// try copying them.
-std::set::const_iterator aIter;
+std::set::const_iterator
aIter;
std::set aSelTemplates =
maSelTemplates; //Copy to avoid invalidating an iterator
for (aIter = aSelTemplates.begin(); aIter != aSelTemplates.end();
++aIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_Viewer_app.mk
ios/CustomTarget_Viewer_app.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 5a4c573506e4db1891cf873650eb3d154b334d52 Author: Tor Lillqvist Date: Sat Mar 23 13:32:24 2013 +0200 Add images.zip Change-Id: If764bb95ab29b8092b356fee644cfa5190ce3eeb diff --git a/ios/CustomTarget_Viewer_app.mk b/ios/CustomTarget_Viewer_app.mk index cd79db1..436bf46 100644 --- a/ios/CustomTarget_Viewer_app.mk +++ b/ios/CustomTarget_Viewer_app.mk @@ -84,6 +84,11 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,Viewer) mkdir -p $(appdir)/program/resource cp $(OUTDIR)/bin/*en-US.res $(appdir)/program/resource # +# Artwork +# + mkdir -p $(appdir)/share/config + cp -R $(OUTDIR)/bin/images_tango.zip $(appdir)/share/config/images.zip +# # Set up rc, the "inifile". See getIniFileName_Impl(). # ( \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj |4
1 file changed, 4 insertions(+)
New commits:
commit 2672cbdd00667ecc71b3390a055ee25bb0b06d80
Author: Tor Lillqvist
Date: Sat Mar 23 13:36:13 2013 +0200
Add LOViewerWindow.[hm] to the project
Change-Id: I50ac91fd0e803b1b2322e5c7c25f7bf682a8208d
diff --git a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
index 0535a2b..bef9ae0 100644
--- a/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
+++ b/ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj
@@ -18,6 +18,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ BE08805B16FDB784000CED5C /* LOViewerWindow.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
LOViewerWindow.h; sourceTree = ""; };
+ BE08805C16FDB784000CED5C /* LOViewerWindow.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= LOViewerWindow.m; sourceTree = ""; };
BE5A22551664F87600CF01C9 /* Viewer.app */ = {isa =
PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0;
path = Viewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
BE5A22591664F87600CF01C9 /* UIKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree =
SDKROOT; };
BE5A225B1664F87600CF01C9 /* Foundation.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
@@ -83,6 +85,8 @@
BE69AD3716958CA0001BE1CD /* Resources */,
BE5A22681664F87600CF01C9 /*
LOViewerAppDelegate.h */,
BE5A22691664F87600CF01C9 /*
LOViewerAppDelegate.mm */,
+ BE08805B16FDB784000CED5C /* LOViewerWindow.h */,
+ BE08805C16FDB784000CED5C /* LOViewerWindow.m */,
BE5A22601664F87600CF01C9 /* Supporting Files */,
);
path = Viewer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sal/osl sc/source sfx2/inc sfx2/source vcl/coretext
sal/osl/unx/file.cxx | 12
sc/source/ui/docshell/docsh.cxx |8 ++--
sc/source/ui/docshell/docsh4.cxx |9 +++--
sc/source/ui/unoobj/confuno.cxx |4
sc/source/ui/view/viewfunc.cxx |2 ++
sfx2/inc/sfx2/objsh.hxx |8 +++-
sfx2/source/doc/objmisc.cxx |5 -
sfx2/source/doc/objstor.cxx |2 ++
sfx2/source/doc/objxtor.cxx |3 ++-
sfx2/source/doc/sfxbasemodel.cxx |2 ++
sfx2/source/view/viewfrm.cxx |6 --
vcl/coretext/salgdi.cxx |6 ++
12 files changed, 58 insertions(+), 9 deletions(-)
New commits:
commit 83a486546f535b32a565d9215e7584c5572c2fb0
Author: Tor Lillqvist
Date: Sat Mar 23 17:17:20 2013 +0200
Shared documents make no sense for Android and iOS
(When I say documents, I mean spreadsheets. Only Calc has code for
this.)
Change-Id: I05fd19885633f9e250940678d33e2e4c82c31a9d
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 7a2aeba..045eaa5 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -635,6 +635,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint&
rHint )
{
case SFX_EVENT_LOADFINISHED:
{
+#if !defined(ANDROID) && !defined(IOS)
// the readonly documents should not be opened in shared
mode
if ( HasSharedXMLFlagSet() &&
!SC_MOD()->IsInSharedDocLoading() && !IsReadOnly() )
{
@@ -654,10 +655,12 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint&
rHint )
SetReadOnlyUI( sal_True );
}
}
+#endif
}
break;
case SFX_EVENT_VIEWCREATED:
{
+#if !defined(ANDROID) && !defined(IOS)
if ( IsDocShared() && !SC_MOD()->IsInSharedDocLoading() )
{
ScAppOptions aAppOptions = SC_MOD()->GetAppOptions();
@@ -675,7 +678,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint&
rHint )
}
}
}
-
+#endif
try
{
uno::Reference< uno::XComponentContext > xContext(
@@ -717,6 +720,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint&
rHint )
break;
case SFX_EVENT_SAVEDOC:
{
+#if !defined(ANDROID) && !defined(IOS)
if ( IsDocShared() && !SC_MOD()->IsInSharedDocSaving() )
{
bool bSuccess = false;
@@ -900,7 +904,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint&
rHint )
if ( !bSuccess )
SetError( ERRCODE_IO_ABORT, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); // this error code will
produce no error message, but will break the further saving process
}
-
+#endif
if (pSheetSaveData)
pSheetSaveData->SetInSupportedSave(true);
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 93d1ca0..42f7038 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -766,6 +766,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
aDocument.SetChangeViewSettings(aChangeViewSet);
}
}
+#if !defined(ANDROID) && !defined(IOS)
else if ( nSlot == SID_DOCUMENT_MERGE && IsDocShared()
&& pChangeTrack )
{
sal_uLong nEnd = pChangeTrack->GetActionMax();
@@ -784,6 +785,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
PostPaintGridAll();
}
}
+#endif
}
pOtherDocSh->DoClose(); // delete passiert mit der Ref
}
@@ -895,6 +897,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
}
break;
+#if !defined(ANDROID) && !defined(IOS)
case SID_SHARE_DOC:
{
ScViewData* pViewData = GetViewData();
@@ -1071,7 +1074,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
rReq.Done();
}
break;
-
+#endif
case SID_OPEN_CALC:
{
SfxStringItem aApp(SID_DOC_SERVICE,
rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"));
@@ -2297,7 +2300,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl,
sfx2::FileDialogHelper*, _pFileDlg )
return 0;
}
-//--
+#if !defined(ANDROID) && !defined(IOS)
void ScDocShell::EnableSharedSettings( bool bEnable )
{
@@ -2376,4 +2379,6 @@
[Libreoffice-commits] core.git: 2 commits - desktop/source framework/source sc/source sfx2/inc sfx2/source solenv/gbuild svl/Library_svl.mk sw/source vcl/source
desktop/source/app/app.cxx|8
++--
desktop/source/app/cmdlineargs.cxx|2 +
desktop/source/app/officeipcthread.cxx| 10
++---
desktop/source/app/userinstall.cxx|2 -
desktop/source/deployment/manager/dp_activepackages.cxx | 17
--
desktop/source/deployment/manager/dp_activepackages.hxx |4 +-
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 13
---
desktop/source/deployment/registry/help/dp_help.cxx |4 +-
framework/source/services/autorecovery.cxx|4 ++
sc/source/ui/docshell/docsh.cxx |6
+--
sc/source/ui/docshell/docsh4.cxx |6
+--
sc/source/ui/unoobj/confuno.cxx |4 +-
sc/source/ui/view/viewfunc.cxx|2 -
sfx2/inc/sfx2/objsh.hxx |2 -
sfx2/source/doc/docfile.cxx | 17
+-
sfx2/source/doc/objmisc.cxx |2 -
sfx2/source/doc/objstor.cxx |2 -
sfx2/source/doc/objxtor.cxx |2 -
sfx2/source/doc/sfxbasemodel.cxx |2 -
sfx2/source/view/viewfrm.cxx |4 +-
solenv/gbuild/Helper.mk |4 ++
solenv/gbuild/gbuild.mk |3 +
svl/Library_svl.mk|3 +
sw/source/ui/uiview/viewport.cxx |4 +-
vcl/source/app/dbggui.cxx |2 -
vcl/source/window/window.cxx |2 -
26 files changed, 82 insertions(+), 49 deletions(-)
New commits:
commit 5a5c8e253abbef5626dab70f8978275ac3c742f8
Author: Tor Lillqvist
Date: Sat Mar 23 19:06:58 2013 +0200
Check feature test macros instead of ANDROID and/or IOS
Pass -DLIBO_FEATURE_FOO to compiler for some elements in BUILD_TYPE.
BUILD_TYPE has at least two kinds of elements: Those that indicate
building a bundled copy of some 3rd-party library, and those that
indicate some specific feature of the LibreOffice platform or
build-time configuration choice. This is for the latter kind.
Change many of the checks for Android and/or iOS in the source code to
check LIBO_FEATURE_DESKTOP, LIBO_FEATURE_HELP or DISABLE_EXTENSIONS
instead, in cases where that is what is meant, not Android or iOS
specifically.
Change-Id: I2cd3f3bb99e953c7754dcea76a426f8f9d61e4db
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index d3e7b26..6a3e3de 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1386,7 +1386,8 @@ int Desktop::Main()
new DesktopContext( com::sun::star::uno::getCurrentContext() ) );
CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
-#if !defined(ANDROID) && !defined(IOS)
+
+#ifdef LIBO_FEATURE_DESKTOP
OUString aUnknown( rCmdLineArgs.GetUnknown() );
if ( !aUnknown.isEmpty() )
{
@@ -1450,7 +1451,8 @@ int Desktop::Main()
// there is no other instance using our data files from a remote host
RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main ->
Lockfile" );
m_xLockfile.reset(new Lockfile);
-#if !defined(ANDROID) && !defined(IOS)
+
+#ifdef LIBO_FEATURE_DESKTOP
if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
!rCmdLineArgs.IsNoLockcheck() && !m_xLockfile->check(
Lockfile_execWarning ))
{
@@ -1537,7 +1539,7 @@ int Desktop::Main()
*/
Application::GetDefaultDevice();
-#if !defined(ANDROID) && !defined(IOS)
+#ifdef LIBO_FEATURE_DESKTOP
// Check if bundled or shared extensions were added /removed
// and process those extensions (has to be done before checking
// the extension dependencies!
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 6ebe54e..b8cf153 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -442,7 +442,7 @@ bool CommandLineArgs::InterpretCommandLineParameter( const
::rtl::OUString& aArg
{
m_nologo = true;
}
-#if !defined(ANDROID) && !defined(IOS)
+#ifdef LIBO_FEATURE_DESKTOP
else if ( oArg == "nolockcheck" )
{
m_nolockcheck = true;
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index af44990..071e2bb 100644
--- a/
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo59273.docx |binary
sw/qa/extras/ooxmlimport/data/n780645.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 10 +--
writerfilter/source/dmapper/DomainMapperTableManager.hxx |7 +
writerfilter/source/dmapper/TablePropertiesHandler.cxx |8 ++
writerfilter/source/ooxml/model.xml | 19 ---
7 files changed, 45 insertions(+), 11 deletions(-)
New commits:
commit 0dd9158a1fe48dee192a954a8ea24c2efcd64a86
Author: Miklos Vajna
Date: Tue Mar 26 12:15:03 2013 +0100
fdo#59273 import w:tblLayout of DOCX tables
Also add missing to the bnc#780645 testcase
to avoid breaking the build.
(cherry picked from commits 7329df74df134a77d078f47d5c8b70d54c5d1edb and
4821d894f849a4939bbe6fb0a9a5ddd9e10b0467)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.hxx
Change-Id: I9af50a4c176168e2794eaa9b0e8eaeb6b9d06b13
Reviewed-on: https://gerrit.libreoffice.org/3058
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/sw/qa/extras/ooxmlimport/data/fdo59273.docx
b/sw/qa/extras/ooxmlimport/data/fdo59273.docx
new file mode 100644
index 000..fcdfd77
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo59273.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/n780645.docx
b/sw/qa/extras/ooxmlimport/data/n780645.docx
index 12ffa38..35ad11f 100755
Binary files a/sw/qa/extras/ooxmlimport/data/n780645.docx and
b/sw/qa/extras/ooxmlimport/data/n780645.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 51ce241..aeda333 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -115,6 +115,7 @@ public:
void testFdo59638();
void testFdo61343();
void testFdo60922();
+void testFdo59273();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -182,6 +183,7 @@ void Test::run()
{"fdo59638.docx", &Test::testFdo59638},
{"fdo61343.docx", &Test::testFdo61343},
{"fdo60922.docx", &Test::testFdo60922},
+{"fdo59273.docx", &Test::testFdo59273},
};
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1140,6 +1142,16 @@ void Test::testFdo60922()
CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
getProperty(getRun(getParagraph(1), 1), "CharEscapementHeight"));
}
+void Test::testFdo59273()
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xTableRows(xTextTable->getRows(),
uno::UNO_QUERY);
+// Was 9997, so the 4th column had ~zero width
+CPPUNIT_ASSERT_EQUAL(sal_Int16(7498), getProperty<
uno::Sequence >(xTableRows->getByIndex(0),
"TableColumnSeparators")[2].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d81aea7..0298690 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -51,6 +51,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_nTableWidth(0),
m_bOOXML( bOOXML ),
m_bPushCurrentWidth(false),
+m_nLayoutType(0),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -395,6 +396,7 @@ void DomainMapperTableManager::startLevel( )
m_aTablePositions.push_back( pNewPositionHandler );
m_nCell.push_back( 0 );
m_nTableWidth = 0;
+m_nLayoutType = 0;
// And push it back to the right level.
if (oCurrentWidth)
@@ -408,6 +410,7 @@ void DomainMapperTableManager::endLevel( )
m_aCellWidths.pop_back( );
m_nCell.pop_back( );
m_nTableWidth = 0;
+m_nLayoutType = 0;
DomainMapperTableManager_Base_t::endLevel( );
@@ -548,12 +551,13 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
-else if (pCellWidths->size() > 0)
+else if (pCellWidths->size() > 0 && m_nLayoutType ==
NS_ooxml::LN_Value_wordprocessingml_ST_TblLayout_fixed)
{
// If we're here, then the number of cells does not equal to the amount
// defined by the grid, even after taking care of
// gridSpan/gridBefore/gridAfter. Handle this by ignoring the grid and
-// providing the separators based on the provided cell widths.
+// providing the separators based on the provided cell widths, as long
+// as
[PUSHED libreoffice-4-0] fdo#59273 import w:tblLayout of DOCX tables
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3058 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3058 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9af50a4c176168e2794eaa9b0e8eaeb6b9d06b13 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablecontroller.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 60570afbeaa058b6f8a9b878cc41b1535ef6e5f0
Author: K_Karthikeyan
Date: Sun Mar 24 09:18:31 2013 +0300
Resolves fdo#61540
On Insert before, the reference column whose size is going to be used for
newly created column(s) is wrong. As the new columns are inserted before the
reference column, the reference column moved to the new position by no., of
new
columns i.e (earlier+newcolumns).
Change-Id: Ib52e3633aecb1220cdf709058391361376dc5f00
Reviewed-on: https://gerrit.libreoffice.org/2958
Reviewed-by: Petr Mladek
Tested-by: Petr Mladek
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 1cb3035..74c42cb 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -554,9 +554,14 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const
SfxItemSet* pArgs )
for( sal_Int32 nOffset = 0; nOffset < nNewColumns; nOffset++ )
{
-Reference< XPropertySet >( xCols->getByIndex( aEnd.mnCol +
nOffset + 1 ), UNO_QUERY_THROW )->
+// Resolves fdo#61540
+// On Insert before, the reference column whose size is going
to be
+// used for newly created column(s) is wrong. As the new
columns are
+// inserted before the reference column, the reference column
moved
+// to the new position by no., of new columns i.e
(earlier+newcolumns).
+Reference< XPropertySet
>(xCols->getByIndex(nNewStartColumn+nOffset), UNO_QUERY_THROW )->
setPropertyValue( sSize,
-Reference< XPropertySet >( xCols->getByIndex(
aStart.mnCol + nOffset ), UNO_QUERY_THROW )->
+Reference< XPropertySet >(xCols->getByIndex(
bInsertAfter?nNewStartColumn-1:nNewStartColumn+nNewColumns ), UNO_QUERY_THROW
)->
getPropertyValue( sSize ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Resolves fdo#61540
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2958 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2958 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib52e3633aecb1220cdf709058391361376dc5f00 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Karthikeyan Krishnamurthi Gerrit-Reviewer: Lior Kaplan Gerrit-Reviewer: Petr Mladek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - vcl/coretext vcl/ios vcl/source
vcl/coretext/salgdi.cxx |6 +++---
vcl/ios/iosinst.cxx | 15 +--
vcl/source/window/window.cxx | 14 +++---
3 files changed, 15 insertions(+), 20 deletions(-)
New commits:
commit 59c83ffb05865a5e492c3204228e85ca006e2b5b
Author: Tor Lillqvist
Date: Sun Mar 24 00:22:15 2013 +0200
Don't exit intentionally
Change-Id: I1d4c7dbc8ed9254e92d097454704c811ba1532f1
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 3ce3a65..b2178e9 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -236,21 +236,16 @@ void InitSalData() {}
void DeInitSalData() {}
void InitSalMain() {}
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
{
-rtl::OUString aError( rErrorText );
-if( aError.isEmpty() )
-aError = rtl::OUString::createFromAscii("Unknown application error");
-
-if( bDumpCore )
-abort();
-else
-_exit(1);
+(void) bDumpCore;
+
+NSLog(@"SalAbort: %s", OUStringToOString(rErrorText,
osl_getThreadTextEncoding()).getStr() );
}
const OUString& SalGetDesktopEnvironment()
{
-static rtl::OUString aEnv( "android" );
+static OUString aEnv( "iOS" );
return aEnv;
}
commit d6869762a903d1614a9592508092f0721e5a4633
Author: Tor Lillqvist
Date: Sun Mar 24 00:10:07 2013 +0200
Try kCGImageAlphaNoneSkipLast
Change-Id: I127f450ae7c52f25033a6dbc34029545ea5ed07b
diff --git a/vcl/coretext/salgdi.cxx b/vcl/coretext/salgdi.cxx
index d2a0281..c7db660 100644
--- a/vcl/coretext/salgdi.cxx
+++ b/vcl/coretext/salgdi.cxx
@@ -285,7 +285,7 @@ bool SvpSalGraphics::CheckContext()
basebmp::RawMemorySharedArray pixelBuffer = m_aDevice->getBuffer();
mrContext = CGBitmapContextCreate(pixelBuffer.get(), size.getX(),
size.getY(), 8, m_aDevice->getScanlineStride(),
- CGColorSpaceCreateDeviceRGB(),
kCGImageAlphaLast|kCGBitmapByteOrder32Little);
+ CGColorSpaceCreateDeviceRGB(),
kCGImageAlphaNoneSkipLast);
SAL_WARN_IF( mrContext == NULL, "vcl.ios", "CheckContext() failed" );
commit 9f1a3352b5cb04e877785af3110f56d2d3418eda
Author: Tor Lillqvist
Date: Sat Mar 23 23:22:31 2013 +0200
Improve debugging printout a bit
Change-Id: I1acc1b3f1e9d2cdcbba058b050f278e396f115c6
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 459b917..81b002f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4223,11 +4223,11 @@ namespace
pWindow = &i_rWindow;
rtl::OStringBuffer aErrorString;
-aErrorString.append(char(13));
+aErrorString.append(' ');
aErrorString.append(typeid( *pWindow ).name());
-aErrorString.append(" (window text: '");
+aErrorString.append(" (");
aErrorString.append(rtl::OUStringToOString(pWindow->GetText(),
RTL_TEXTENCODING_UTF8));
-aErrorString.append("')");
+aErrorString.append(")");
return aErrorString.makeStringAndClear();
}
}
@@ -4377,7 +4377,7 @@ Window::~Window()
aTempStr.append("Window (");
aTempStr.append(rtl::OUStringToOString(GetText(),
RTL_TEXTENCODING_UTF8));
-aTempStr.append(") with living SystemWindow(s) destroyed: ");
+aTempStr.append(") with live SystemWindows destroyed: ");
aTempStr.append(aErrorStr.toString());
OSL_FAIL(aTempStr.getStr());
// abort in non-pro version, this must be fixed!
@@ -4401,7 +4401,7 @@ Window::~Window()
{
rtl::OStringBuffer aTempStr( "Window (" );
aTempStr.append(rtl::OUStringToOString(GetText(),
RTL_TEXTENCODING_UTF8));
-aTempStr.append(") with living SystemWindow(s) destroyed: ");
+aTempStr.append(") with live SystemWindows destroyed: ");
aTempStr.append(aErrorStr.toString());
OSL_FAIL( aTempStr.getStr() );
GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(),
RTL_TEXTENCODING_UTF8)); // abort in non-pro version, this must be fixed!
@@ -4411,7 +4411,7 @@ Window::~Window()
{
rtl::OStringBuffer aTempStr("Window (");
aTempStr.append(rtl::OUStringToOString(GetText(),
RTL_TEXTENCODING_UTF8));
-aTempStr.append(") with living Child(s) destroyed: ");
+aTempStr.append(") with live children destroyed: ");
pTempWin = mpWindowImpl->mpFirstChild;
while ( pTempWin )
{
@@ -4426,7 +4426,7 @@ Window::~Window()
{
rtl::OStringBuffer aTempStr("Window (");
aTempStr.append(rtl::OUStringToOString(GetText(),
RTL_TEXTENCODING_UTF8));
-aTempStr.append(") with living SystemWindow(s) destroyed: ");
+
[Libreoffice-commits] core.git: 9 commits - basebmp/source ios/CustomTarget_Viewer_app.mk ios/experimental sal/inc sc/source tools/inc vcl/ios
basebmp/source/bitmapdevice.cxx |3 -
ios/CustomTarget_Viewer_app.mk | 12
ios/experimental/Viewer/Viewer.xcodeproj/project.pbxproj | 38 ++-
ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm|6 +-
ios/experimental/Viewer/Viewer/lo-viewer.mm |4 +
sal/inc/osl/detail/ios-bootstrap.h |1
sc/source/ui/docshell/docsh4.cxx |3 -
tools/inc/tools/gen.hxx |7 +-
vcl/ios/iosinst.cxx |8 +++
9 files changed, 75 insertions(+), 7 deletions(-)
New commits:
commit bcb57baaae2d7e6914ab4dd8eb5232aeacddbb72
Author: Tor Lillqvist
Date: Tue Mar 26 00:24:29 2013 +0200
Use the applicationFrame and not whole screen size
Change-Id: I33a67b4908759913e49608110cc2635cc50e54b1
diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
index 7e7216f..271342b 100644
--- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
+++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
@@ -26,7 +26,7 @@ static UIWindow *theWindow;
(void) application;
(void) launchOptions;
-CGRect bounds = [[UIScreen mainScreen] bounds];
+CGRect bounds = [[UIScreen mainScreen] applicationFrame];
self.window = [[LOViewerWindow alloc] initWithFrame:bounds];
theWindow = self.window;
commit 6d7d274151d18be9c806f72ac3ce10638e483bea
Author: Tor Lillqvist
Date: Mon Mar 25 20:29:28 2013 +0200
I think kCGImageAlphaNoneSkipLast is what we want
Change-Id: I19a5ab15650cef4ee834af63e19bea7807b77477
diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
index 9f72b35..7e7216f 100644
--- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
+++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
@@ -39,7 +39,7 @@ static UIWindow *theWindow;
memset(pixelBuffer, 0xFF, nbytes);
CGDataProviderRef provider = CGDataProviderCreateWithData( NULL,
pixelBuffer, nbytes, NULL);
-image = CGImageCreate(bounds.size.width, bounds.size.height, 8, 32,
bounds.size.width*4, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaFirst,
provider, NULL, false, kCGRenderingIntentDefault);
+image = CGImageCreate(bounds.size.width, bounds.size.height, 8, 32,
bounds.size.width*4, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaNoneSkipLast,
provider, NULL, false, kCGRenderingIntentDefault);
self.window.bounds = bounds;
self.window.pixelBuffer = pixelBuffer;
commit 881814077515605ab4f816530b81709663de50a2
Author: Tor Lillqvist
Date: Mon Mar 25 19:52:30 2013 +0200
Introduce temporary lo_set_view_size() hack like on Android and call it
Change-Id: I44df0946f59d1b9a2a6ea935b3c2ea3c96c1260d
diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
index f9678c4..9f72b35 100644
--- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
+++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
@@ -45,6 +45,8 @@ static UIWindow *theWindow;
self.window.pixelBuffer = pixelBuffer;
self.window.image = image;
+lo_set_view_size(bounds.size.width, bounds.size.height);
+
[self.window makeKeyAndVisible];
NSThread* thread = [[NSThread alloc] initWithTarget:self
diff --git a/sal/inc/osl/detail/ios-bootstrap.h
b/sal/inc/osl/detail/ios-bootstrap.h
index d5fd947..4738f28 100644
--- a/sal/inc/osl/detail/ios-bootstrap.h
+++ b/sal/inc/osl/detail/ios-bootstrap.h
@@ -42,6 +42,7 @@ void lo_damaged();
/* 2) */
void lo_runMain();
+void lo_set_view_size(int width, int height);
void lo_render_windows(char *pixelBuffer, int width, int height);
#ifdef __cplusplus
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index b2178e9..8e3137b 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -297,6 +297,14 @@ int IosSalSystem::ShowNativeDialog( const rtl::OUString&
rTitle,
}
extern "C"
+void lo_set_view_size(int width, int height)
+{
+// Horrible
+viewWidth = width;
+viewHeight = height;
+}
+
+extern "C"
void lo_render_windows(char *pixelBuffer, int width, int height)
{
// Hack: assume so far that we are asked to redraw the whole pixel buffer
commit 89d9b9e252f0584afb0e0d995c80c114697a7aa1
Author: Tor Lillqvist
Date: Mon Mar 25 17:55:19 2013 +0200
Log also corresponding destructions of BitmapDevice
Change-Id: Ic74032b430691215482172c3c5f834374d47873d
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 24916f6..a6774d1 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1090,6 +1090,7 @@ BitmapDevice::BitmapDevice( const basegfx::B2IBox&
rBounds,
BitmapDevice::~BitmapDevice()
{
// outline, because of internal Impl
Re: [PATCH] Init: fixed typo in the SystemDialog class.
Michael Meeks píše v Po 25. 03. 2013 v 13:28 +: > On Mon, 2013-03-25 at 12:57 +0100, Javier Fernandez wrote: > > Yes :) sorry about that. It was only for the first push; I had a big > > commit before, but I thought it was easier to review it that way. I was > > not sure what would be the result, in terms of gerrit process. > > Hey - that's no problem. I've merged ~everything to master - except for > the changes that enable the new component - so (hopefully) it sits there > without causing issues in master since it's not enabled yet. I guess that you did not merge the following two commits by purpose: + https://gerrit.libreoffice.org/#/c/3027/ Pack and register the Web wizard. + https://gerrit.libreoffice.org/#/c/3028/ Ugly Hack: using our own WebConfigSet while the Topic stuff is not integrated. I do not see any comments in gerrit. What are the plans here? ;-) Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 9 commits - sc/source sw/source vcl/coretext vcl/headless vcl/inc vcl/ios vcl/source
sc/source/core/data/documen8.cxx |4
sw/source/core/doc/docnew.cxx |4
vcl/coretext/salcoretextlayout.cxx | 17 -
vcl/coretext/salgdi.cxx| 34 ++
vcl/headless/svpbmp.cxx|1 +
vcl/headless/svpgdi.cxx| 24
vcl/inc/vcl/sysdata.hxx|6 --
vcl/inc/vcl/virdev.hxx | 28 +++-
vcl/ios/iosinst.cxx| 16
vcl/source/gdi/virdev.cxx |6 --
10 files changed, 98 insertions(+), 42 deletions(-)
New commits:
commit 4ac0eff680a9fbf81dfd9e8a5772dee93bd0fb1a
Author: Tor Lillqvist
Date: Tue Mar 26 18:32:41 2013 +0200
Re-add change from 304cb6ab8fb159c883c42d2d42e82750fab4e4a7
Was accidentally reverted.
Change-Id: I1d62003cfab222664b7cf2053f640287910b2892
diff --git a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
index 7e7216f..271342b 100644
--- a/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
+++ b/ios/experimental/Viewer/Viewer/LOViewerAppDelegate.mm
@@ -26,7 +26,7 @@ static UIWindow *theWindow;
(void) application;
(void) launchOptions;
-CGRect bounds = [[UIScreen mainScreen] bounds];
+CGRect bounds = [[UIScreen mainScreen] applicationFrame];
self.window = [[LOViewerWindow alloc] initWithFrame:bounds];
theWindow = self.window;
commit 92b973fadcf63409026237884e81a1e3f3e62660
Author: Tor Lillqvist
Date: Mon Mar 25 08:04:27 2013 +0200
Use an 8bpp virtual device (instead of a 1bpp one) in sw and sc for iOS
The reason why a 1bpp virtual device is used in these two places in sc
and sw is unclear to me. It causes complications on iOS as such a
bitmap gets passed to CGBitmapContextCreate() which does not accept
1bpp bitmaps. But let's keep the 1bpp for other platforms.
Change-Id: Ia34927cf728d4be05a31e88b7da78200d0b799ba
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index f535235..9a6c0fb 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -207,7 +207,11 @@ VirtualDevice* ScDocument::GetVirtualDevice_100th_mm()
{
if (!pVirtualDevice_100th_mm)
{
+#ifdef IOS
+pVirtualDevice_100th_mm = new VirtualDevice( 8 );
+#else
pVirtualDevice_100th_mm = new VirtualDevice( 1 );
+#endif
pVirtualDevice_100th_mm->SetReferenceDevice(VirtualDevice::REFDEV_MODE_MSO1);
MapMode aMapMode( pVirtualDevice_100th_mm->GetMapMode() );
aMapMode.SetMapUnit( MAP_100TH_MM );
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 7ffacc3..c978716 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -698,7 +698,11 @@ SwDoc::~SwDoc()
VirtualDevice& SwDoc::CreateVirtualDevice_() const
{
+#ifdef IOS
+VirtualDevice* pNewVir = new VirtualDevice( 8 );
+#else
VirtualDevice* pNewVir = new VirtualDevice( 1 );
+#endif
pNewVir->SetReferenceDevice( VirtualDevice::REFDEV_MODE_MSO1 );
diff --git a/vcl/inc/vcl/virdev.hxx b/vcl/inc/vcl/virdev.hxx
index 9c8c4ed..5d8a70e 100644
--- a/vcl/inc/vcl/virdev.hxx
+++ b/vcl/inc/vcl/virdev.hxx
@@ -65,23 +65,41 @@ private:
SAL_DLLPRIVATE bool ForceZeroExtleadBug() const
{ return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); }
public:
+/** Create a virtual device of size 1x1
+
+@param nBitCount
+Bit depth of the generated virtual device. Use 0 here, to
+indicate: take default screen depth. Only 0, 1 and 8
+are allowed here, with 1 denoting binary mask and 8 a graylevel mask.
+ */
VirtualDevice( sal_uInt16 nBitCount = 0 );
+
+/** Create a virtual device of size 1x1
+
+@param rCompDev
+The generated vdev will be compatible to this device.
+
+@param nBitCount
+Bit depth of the generated virtual device. Use 0 here, to
+indicate: take default screen depth. Only 0 and 1
+are allowed here, with 1 denoting binary mask.
+ */
VirtualDevice( const OutputDevice& rCompDev,
sal_uInt16 nBitCount = 0 );
-/** Create a virtual device with alpha channel
+
+/** Create a virtual device of size 1x1 with alpha channel
@param rCompDev
-The generated vdev will be compatible to this device. By
-default, Application::GetDefaultDevice() is used here.
+The generated vdev will be compatible to this device.
@param nBitCount
Bit depth of the generated virtual device. Use 0 here, to
-indicate: take default screen depth. Currently, only 0 and 1
+indicate: take default screen depth. Only 0 and 1
are allowed here, with 1 denoting binary mask.
@param nAlphaBitCount
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpoleobject.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 700b6c1cbf4fee4044aa2b7179d3f1886ae928c6
Author: Tor Lillqvist
Date: Tue Mar 26 19:24:15 2013 +0200
Fix warning: unused variable 'sFormat' [loplugin]
Presumably the call to m_pObjStrm->QuickReadStringPtr() is still necessary
because of its side-effects (to update the stream pointer).
Change-Id: I69f24de4e956d5fefb4fc5382c0cc7e0173a5a0f
diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx
b/lotuswordpro/source/filter/lwpoleobject.cxx
index c818118..842e199 100644
--- a/lotuswordpro/source/filter/lwpoleobject.cxx
+++ b/lotuswordpro/source/filter/lwpoleobject.cxx
@@ -220,7 +220,7 @@ void LwpOleObject::Read()
{
m_pObjStrm->QuickReaduInt16();
-OUString sFormat = m_pObjStrm->QuickReadStringPtr();
+m_pObjStrm->QuickReadStringPtr();
if (LwpFileHeader::m_nFileRevision < 0x000B)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
