[Libreoffice-commits] .: dbaccess/source svtools/inc svtools/source
dbaccess/source/ui/dlg/CollectionView.cxx |2 -
svtools/inc/svtools/fileview.hxx |7 +--
svtools/source/contnr/fileview.cxx| 60 +++---
svtools/source/contnr/templwin.cxx|2 -
4 files changed, 26 insertions(+), 45 deletions(-)
New commits:
commit f10fc42189b3d3f6dd180234da9777e53e92b7e4
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Dec 28 20:00:03 2011 +0400
fdo#44204: shrink the first column in the open dialog, remove unused flags
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 8370e39..a41a366 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -80,7 +80,7 @@ OCollectionView::OCollectionView( Window * pParent
, m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) )
, m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) )
, m_aUp(this, ModuleRes( BTN_EXPLORERFILE_UP ) )
-, m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE )
+, m_aView( this, ModuleRes( CTRL_VIEW ), FILEVIEW_SHOW_ONLYTITLE )
, m_aFTName(this, ModuleRes( FT_EXPLORERFILE_FILENAME ) )
, m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) )
, m_aFL(this, ModuleRes( FL_1 ) )
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index d56826f..ec40c05 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -43,11 +43,8 @@
#define FILEVIEW_ONLYFOLDER 0x0001
#define FILEVIEW_MULTISELECTION 0x0002
-#define FILEVIEW_SHOW_TITLE 0x0010
-#define FILEVIEW_SHOW_SIZE 0x0020
-#define FILEVIEW_SHOW_DATE 0x0040
-#define FILEVIEW_SHOW_ALL 0x0070
-#define FILEVIEW_SHOW_NONE 0x0080
+#define FILEVIEW_SHOW_ONLYTITLE 0x0010
+#define FILEVIEW_SHOW_NONE 0x0020
class ViewTabListBox_Impl;
class SvtFileView_Impl;
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 4f17f34..f726a09 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -722,24 +722,29 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window*
pParentWin,
mbEnableRename ( sal_True )
{
-sal_Bool bViewHeader = true;
+const bool bViewHeader = (nFlags FILEVIEW_SHOW_NONE) == 0;
Size aBoxSize = pParentWin-GetSizePixel();
mpHeaderBar = new HeaderBar( pParentWin, WB_BUTTONSTYLE | WB_BOTTOMBORDER
);
mpHeaderBar-SetPosSizePixel( Point( 0, 0 ),
mpHeaderBar-CalcWindowSizePixel() );
HeaderBarItemBits nBits = ( HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE );
-if ((nFlags FILEVIEW_SHOW_NONE) == FILEVIEW_SHOW_NONE)
-bViewHeader = false;
+if (nFlags FILEVIEW_SHOW_ONLYTITLE)
+{
+long pTabs[] = { 2, 20, 600 };
+SetTabs(pTabs[0], MAP_PIXEL);
+
+mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW);
+}
else
{
-if (nFlags FILEVIEW_SHOW_TITLE)
-mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW);
-if (nFlags FILEVIEW_SHOW_ALL)
-mpHeaderBar-InsertItem(COLUMN_TYPE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits);
-if (nFlags FILEVIEW_SHOW_SIZE)
-mpHeaderBar-InsertItem(COLUMN_SIZE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits);
-if (nFlags FILEVIEW_SHOW_DATE)
-mpHeaderBar-InsertItem(COLUMN_DATE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits);
+long pTabs[] = { 5, 20, 180, 320, 400, 600 };
+SetTabs(pTabs[0], MAP_PIXEL);
+SetTabJustify(2, AdjustRight); // column Size
+
+mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 180, nBits | HIB_UPARROW);
+mpHeaderBar-InsertItem(COLUMN_TYPE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits);
+mpHeaderBar-InsertItem(COLUMN_SIZE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits);
+mpHeaderBar-InsertItem(COLUMN_DATE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits);
}
Size aHeadSize = mpHeaderBar-GetSizePixel();
@@ -748,6 +753,8 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window*
pParentWin,
InitHeaderBar( mpHeaderBar );
SetHighlightRange();
SetEntryHeight( ROW_HEIGHT );
+if (nFlags FILEVIEW_MULTISELECTION)
+SetSelectionMode( MULTIPLE_SELECTION );
Show();
if( bViewHeader )
@@ -1211,7 +1218,7 @@ SvtFileView::SvtFileView( Window* pParent, const ResId
rResId,
Control( pParent, rResId )
{
-sal_Int8 nFlags = FILEVIEW_SHOW_ALL;
+sal_Int8 nFlags = 0;
if ( bOnlyFolder )
nFlags |= FILEVIEW_ONLYFOLDER;
if ( bMultiSelection )
@@
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source svtools/inc svtools/source
dbaccess/source/ui/dlg/CollectionView.cxx |2 -
svtools/inc/svtools/fileview.hxx |7 +--
svtools/source/contnr/fileview.cxx| 60 +++---
svtools/source/contnr/templwin.cxx|2 -
4 files changed, 26 insertions(+), 45 deletions(-)
New commits:
commit 150c18ecb0d0eb0dbcef50bb1d76b7c549255104
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Dec 28 20:00:03 2011 +0400
fdo#44204: shrink the first column in the open dialog, remove unused flags
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx
b/dbaccess/source/ui/dlg/CollectionView.cxx
index 23e4762..af28a0b 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -80,7 +80,7 @@ OCollectionView::OCollectionView( Window * pParent
, m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) )
, m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) )
, m_aUp(this, ModuleRes( BTN_EXPLORERFILE_UP ) )
-, m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE )
+, m_aView( this, ModuleRes( CTRL_VIEW ), FILEVIEW_SHOW_ONLYTITLE )
, m_aFTName(this, ModuleRes( FT_EXPLORERFILE_FILENAME ) )
, m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) )
, m_aFL(this, ModuleRes( FL_1 ) )
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index d56826f..ec40c05 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -43,11 +43,8 @@
#define FILEVIEW_ONLYFOLDER 0x0001
#define FILEVIEW_MULTISELECTION 0x0002
-#define FILEVIEW_SHOW_TITLE 0x0010
-#define FILEVIEW_SHOW_SIZE 0x0020
-#define FILEVIEW_SHOW_DATE 0x0040
-#define FILEVIEW_SHOW_ALL 0x0070
-#define FILEVIEW_SHOW_NONE 0x0080
+#define FILEVIEW_SHOW_ONLYTITLE 0x0010
+#define FILEVIEW_SHOW_NONE 0x0020
class ViewTabListBox_Impl;
class SvtFileView_Impl;
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 4f17f34..f726a09 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -722,24 +722,29 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window*
pParentWin,
mbEnableRename ( sal_True )
{
-sal_Bool bViewHeader = true;
+const bool bViewHeader = (nFlags FILEVIEW_SHOW_NONE) == 0;
Size aBoxSize = pParentWin-GetSizePixel();
mpHeaderBar = new HeaderBar( pParentWin, WB_BUTTONSTYLE | WB_BOTTOMBORDER
);
mpHeaderBar-SetPosSizePixel( Point( 0, 0 ),
mpHeaderBar-CalcWindowSizePixel() );
HeaderBarItemBits nBits = ( HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE );
-if ((nFlags FILEVIEW_SHOW_NONE) == FILEVIEW_SHOW_NONE)
-bViewHeader = false;
+if (nFlags FILEVIEW_SHOW_ONLYTITLE)
+{
+long pTabs[] = { 2, 20, 600 };
+SetTabs(pTabs[0], MAP_PIXEL);
+
+mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW);
+}
else
{
-if (nFlags FILEVIEW_SHOW_TITLE)
-mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 600, nBits | HIB_UPARROW);
-if (nFlags FILEVIEW_SHOW_ALL)
-mpHeaderBar-InsertItem(COLUMN_TYPE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits);
-if (nFlags FILEVIEW_SHOW_SIZE)
-mpHeaderBar-InsertItem(COLUMN_SIZE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits);
-if (nFlags FILEVIEW_SHOW_DATE)
-mpHeaderBar-InsertItem(COLUMN_DATE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits);
+long pTabs[] = { 5, 20, 180, 320, 400, 600 };
+SetTabs(pTabs[0], MAP_PIXEL);
+SetTabJustify(2, AdjustRight); // column Size
+
+mpHeaderBar-InsertItem(COLUMN_TITLE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TITLE)), 180, nBits | HIB_UPARROW);
+mpHeaderBar-InsertItem(COLUMN_TYPE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_TYPE)), 140, nBits);
+mpHeaderBar-InsertItem(COLUMN_SIZE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_SIZE)), 80, nBits);
+mpHeaderBar-InsertItem(COLUMN_DATE,
String(SvtResId(STR_SVT_FILEVIEW_COLUMN_DATE)), 500, nBits);
}
Size aHeadSize = mpHeaderBar-GetSizePixel();
@@ -748,6 +753,8 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window*
pParentWin,
InitHeaderBar( mpHeaderBar );
SetHighlightRange();
SetEntryHeight( ROW_HEIGHT );
+if (nFlags FILEVIEW_MULTISELECTION)
+SetSelectionMode( MULTIPLE_SELECTION );
Show();
if( bViewHeader )
@@ -1211,7 +1218,7 @@ SvtFileView::SvtFileView( Window* pParent, const ResId
rResId,
Control( pParent, rResId )
{
-sal_Int8 nFlags = FILEVIEW_SHOW_ALL;
+sal_Int8 nFlags = 0;
if ( bOnlyFolder )
nFlags |= FILEVIEW_ONLYFOLDER;
if ( bMultiSelection )
@@
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
New commits:
commit 4b0dd950b8b79df004238f372fe55993d5ac5981
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Dec 28 21:43:22 2011 +0100
fdo#35099 fix RTF export of date field
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 17b2de3..9ade064 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1398,14 +1398,19 @@ void RtfAttributeOutput::WriteField_Impl( const
SwField* pFld, ww::eField /*eTyp
{
OSL_TRACE(%s, OSL_THIS_FUNC);
-// NEEDSWORK this has beeen tested only with page numbers
-m_aRunText.append({ OOO_STRING_SVTOOLS_RTF_FIELD);
-m_aRunText.append({ OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_FLDINST );
-m_aRunText.append(m_rExport.OutString(rFldCmd,
m_rExport.eCurrentEncoding));
-m_aRunText.append(}{ OOO_STRING_SVTOOLS_RTF_FLDRSLT );
+// If there are no field instructions, don't export it as a field.
+bool bHasInstructions = rFldCmd.Len() 0;
+if (bHasInstructions)
+{
+m_aRunText.append({ OOO_STRING_SVTOOLS_RTF_FIELD);
+m_aRunText.append({ OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_FLDINST );
+m_aRunText.append(m_rExport.OutString(rFldCmd,
m_rExport.eCurrentEncoding));
+m_aRunText.append(}{ OOO_STRING_SVTOOLS_RTF_FLDRSLT );
+}
if (pFld)
m_aRunText.append(m_rExport.OutString(pFld-ExpandField(true),
m_rExport.eDefaultEncoding));
-m_aRunText.append(}});
+if (bHasInstructions)
+m_aRunText.append(}});
}
void RtfAttributeOutput::WriteBookmarks_Impl( std::vector rtl::OUString
rStarts, std::vector rtl::OUString rEnds )
@@ -2933,9 +2938,11 @@ void RtfAttributeOutput::FormatFrameDirection( const
SvxFrameDirectionItem rDir
}
}
-void RtfAttributeOutput::WriteExpand( const SwField* /*pFld*/ )
+void RtfAttributeOutput::WriteExpand( const SwField* pFld )
{
-OSL_TRACE(TODO: %s, OSL_THIS_FUNC);
+OSL_TRACE(%s, OSL_THIS_FUNC);
+String sCmd;
+m_rExport.OutputField(pFld, ww::eUNKNOWN, sCmd);
}
void RtfAttributeOutput::RefField( const SwField /*rFld*/, const String
/*rRef*/ )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - filter/source sc/source sd/source vcl/inc vcl/source
filter/source/pdf/impdialog.cxx | 13
filter/source/pdf/impdialog.hrc |1
filter/source/pdf/impdialog.hxx |2
filter/source/pdf/impdialog.src | 12
filter/source/pdf/pdfexport.cxx |4
filter/source/pdf/pdfexport.hxx |1
filter/source/pdf/pdffilter.cxx |1
sc/source/core/tool/dbdata.cxx |6
sc/source/ui/unoobj/cursuno.cxx |2
sc/source/ui/vba/vbarange.cxx |2
sd/source/ui/unoidl/unomodel.cxx| 498 ++--
vcl/inc/vcl/pdfextoutdevdata.hxx|4
vcl/source/gdi/pdfextoutdevdata.cxx |9
13 files changed, 300 insertions(+), 255 deletions(-)
New commits:
commit 7da3f1bad5f7791756f8450391d94ba78b3d10cc
Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch
Date: Sat Dec 24 00:16:59 2011 +0100
option to export hidden slides to pdf files
This add the checkbox hidden pages to the PDF export general tab
and if checked, export also to PDF the hidden slides
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 2f0682c..b10bf68 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -93,6 +93,7 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
mbExportFormFields( sal_True ),
mbAllowDuplicateFieldNames( sal_False ),
mbExportBookmarks( sal_True ),
+mbExportHiddenSlides ( sal_False),
mnOpenBookmarkLevels( -1 ),
mbHideViewerToolbar( sal_False ),
@@ -194,6 +195,8 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
mbExportNotes = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportNotes ) ), sal_False );
mbExportBookmarks = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportBookmarks ) ), sal_True );
+if ( mbIsPresentation )
+mbExportHiddenSlides = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportHiddenSlides ) ), sal_False );
mnOpenBookmarkLevels = maConfigItem.ReadInt32( OUString(
RTL_CONSTASCII_USTRINGPARAM( OpenBookmarkLevels ) ), -1 );
mbUseTransitionEffects = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( UseTransitionEffects ) ), sal_True );
mbIsSkipEmptyPages = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( IsSkipEmptyPages ) ), sal_False );
@@ -341,6 +344,8 @@ Sequence PropertyValue ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportNotes ) ), mbExportNotes );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportBookmarks ) ), mbExportBookmarks );
+if ( mbIsPresentation )
+maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportHiddenSlides ) ), mbExportHiddenSlides );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
UseTransitionEffects ) ), mbUseTransitionEffects );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
IsSkipEmptyPages ) ), mbIsSkipEmptyPages );
maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
IsAddStream ) ), mbAddStream );
@@ -458,6 +463,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ),
maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ),
maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ),
+maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ),
maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION )
),
@@ -569,6 +575,9 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const
ImpPDFTabDialog* paParent
{
maCbExportNotesPages.Show( sal_True );
maCbExportNotesPages.Check( paParent-mbExportNotesPages );
+maCbExportHiddenSlides.Show( sal_True);
+maCbExportHiddenSlides.Check( paParent-mbExportHiddenSlides );
+
}
else
{
@@ -581,6 +590,8 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const
ImpPDFTabDialog* paParent
maCbEmbedStandardFonts.SetPosPixel( Point( aPos.X(), aPos.Y() -
nCheckBoxHeight ) );
maCbExportNotesPages.Show( sal_False );
maCbExportNotesPages.Check( sal_False );
+maCbExportHiddenSlides.Show( sal_False);
+maCbExportHiddenSlides.Check( sal_False );
}
maCbExportEmptyPages.Check( !paParent-mbIsSkipEmptyPages );
@@ -606,6 +617,8 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem(
ImpPDFTabDialog* paParent )
if ( mbIsPresentation )
paParent-mbExportNotesPages = maCbExportNotesPages.IsChecked();
paParent-mbExportBookmarks = maCbExportBookmarks.IsChecked();
+if ( mbIsPresentation )
+paParent-mbExportHiddenSlides = maCbExportHiddenSlides.IsChecked();
paParent-mbIsSkipEmptyPages = !maCbExportEmptyPages.IsChecked();
[Libreoffice-commits] .: sc/source
sc/source/core/tool/viewopti.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 86f08de96f4680938444a090912c85e4d23507e8
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Dec 28 22:25:56 2011 +0100
Same expression for comparison and for assignment
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index c5e5c7b..4de68ce 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -90,7 +90,6 @@ void ScGridOptions::SetDefaults()
const ScGridOptions ScGridOptions::operator=( const ScGridOptions rCpy )
{
nFldDrawX = rCpy.nFldDrawX; // UINT32
-nFldDrawX = rCpy.nFldDrawX;
nFldDivisionX = rCpy.nFldDivisionX;
nFldDrawY = rCpy.nFldDrawY;
nFldDivisionY = rCpy.nFldDivisionY;
@@ -109,7 +108,6 @@ const ScGridOptions ScGridOptions::operator=( const
ScGridOptions rCpy )
int ScGridOptions::operator==( const ScGridOptions rCpy ) const
{
return ( nFldDrawX== rCpy.nFldDrawX
- nFldDrawX== rCpy.nFldDrawX
nFldDivisionX== rCpy.nFldDivisionX
nFldDrawY== rCpy.nFldDrawY
nFldDivisionY== rCpy.nFldDivisionY
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/pdfextoutdevdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 39b185e9ce2aa86b36ca80f8286533c306107826 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Dec 28 22:55:15 2011 +0100 Fix init order diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index a2d856d..23d81a4 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -511,8 +511,8 @@ PDFExtOutDevData::PDFExtOutDevData( const OutputDevice rOutDev ) : mbTransitionEffects ( sal_True ), mbUseLosslessCompression( sal_True ), mbReduceImageResolution ( sal_False ), -mbExportNDests ( sal_False ), mbExportHiddenSlides( sal_False ), +mbExportNDests ( sal_False ), mnFormsFormat ( 0 ), mnPage ( -1 ), mpPageSyncData ( NULL ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc
vcl/inc/vcl/pdfextoutdevdata.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9cc02548dec9b953eb186052d424d981cb2addea Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch Date: Thu Dec 29 00:02:18 2011 +0100 change order of var in PDFExtOutDevData to suppress waring diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index c1be576..244a11b 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -92,8 +92,8 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData sal_BoolmbReduceImageResolution; sal_BoolmbExportFormFields; sal_BoolmbExportBookmarks; -sal_BoolmbExportHiddenSlides; sal_BoolmbExportNDests; //i56629 +sal_BoolmbExportHiddenSlides; sal_Int32 mnFormsFormat; sal_Int32 mnPage; com::sun::star::lang::LocalemaDocLocale; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc
vcl/inc/vcl/pdfextoutdevdata.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3bcee0e100e9fdadc2c5b15036caaf2ed53ac6dc Author: Pierre-André Jacquod pjacq...@alumni.ethz.ch Date: Thu Dec 29 00:05:51 2011 +0100 Revert change order of var in PDFExtOutDevData to suppress waring since already corrected in an other way. this reverts commit 9cc02548dec9b953eb186052d424d981cb2addea. diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index 244a11b..c1be576 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -92,8 +92,8 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData sal_BoolmbReduceImageResolution; sal_BoolmbExportFormFields; sal_BoolmbExportBookmarks; -sal_BoolmbExportNDests; //i56629 sal_BoolmbExportHiddenSlides; +sal_BoolmbExportNDests; //i56629 sal_Int32 mnFormsFormat; sal_Int32 mnPage; com::sun::star::lang::LocalemaDocLocale; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/pdf/impdialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a8c895bc18f3167961ab676ec17e1db41d6a378 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Dec 28 23:15:03 2011 +0100 Fix order init diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index b10bf68..583b96b 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -461,9 +461,9 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent, maCbAllowDuplicateFieldNames( this, PDFFilterResId( CB_ALLOWDUPLICATEFIELDNAMES ) ), maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ), +maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ), maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ), maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ), -maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ), maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ), maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ), maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION ) ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - cui/source
cui/source/options/optlingu.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4073928dfd787ed805105f7ab2d5cfed5bb3393c
Author: Lior Kaplan kaplanl...@gmail.com
Date: Thu Dec 29 00:28:29 2011 +0200
fdo#44178: Align dictionary address with DICT_REPO_URL in
instsetoo_native/util/openoffice.lst
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 66c2aee..e245e36 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1137,7 +1137,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
!= SvtExtendedSecurityOptions::OPEN_NEVER )
{
aMoreDictsLink.SetURL( String(
-RTL_CONSTASCII_USTRINGPARAM(
http://extensions.libreoffice.org/dictionary/; ) ) );
+RTL_CONSTASCII_USTRINGPARAM(
http://extensions.libreoffice.org/dictionaries/; ) ) );
aMoreDictsLink.SetClickHdl( LINK( this, SvxLinguTabPage,
OpenURLHdl_Impl ) );
}
else
@@ -2033,7 +2033,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent,
SvxLinguData_Impl rData)
!= SvtExtendedSecurityOptions::OPEN_NEVER )
{
aMoreDictsLink.SetURL( String(
-RTL_CONSTASCII_USTRINGPARAM(
http://extensions.libreoffice.org/dictionary/; ) ) );
+RTL_CONSTASCII_USTRINGPARAM(
http://extensions.libreoffice.org/dictionaries/; ) ) );
aMoreDictsLink.SetClickHdl( LINK( this, SvxEditModulesDlg,
OpenURLHdl_Impl ) );
}
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
