[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/FrameControlsManager.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ebfaf933172ecf7d357b2454750033d4c6e57cd9
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Dec 29 10:55:37 2011 +0100
Some cppcheck cleaning
diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx
b/sw/source/ui/docvw/FrameControlsManager.cxx
index 6b00d56..2ee4886 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -129,7 +129,7 @@ void SwFrameControlsManager::HideControls( FrameControlType
eType )
while ( pIt != m_aControls[eType].end() )
{
( *pIt )-ShowAll( false );
-pIt++;
+++pIt;
}
}
@@ -163,7 +163,7 @@ void SwFrameControlsManager::SetHeaderFooterControl( const
SwPageFrm* pPageFrm,
if ( pToTest-GetPageFrame( ) == pPageFrm
pToTest-IsHeader( ) == bHeader )
pControl = *pIt;
-pIt++;
+++pIt;
}
if ( !pControl.get() )
@@ -197,7 +197,7 @@ void SwFrameControlsManager::SetPageBreakControl( const
SwPageFrm* pPageFrm )
SwPageBreakWin* pToTest = dynamic_cast SwPageBreakWin* ( pIt-get()
);
if ( pToTest-GetPageFrame( ) == pPageFrm )
pControl = *pIt;
-pIt++;
+++pIt;
}
if ( !pControl.get() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 5 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 sd/source/ui/unoidl/unomodel.cxx| 498 ++-- vcl/inc/vcl/pdfextoutdevdata.hxx|4 vcl/source/gdi/pdfextoutdevdata.cxx |9 11 files changed, 298 insertions(+), 253 deletions(-) New commits: commit 146fa8dabe816d35e7b879172baa00027575d3b2 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 cae790a..182af3c 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -453,9 +453,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 ) ), commit 6ea45acb55294fe99dbe44dec1ff844ab0989111 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 ), commit 0fcf0fa0a6760d85e791bd4a63fe6a0a75e59ea5 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 25dbbd1..cae790a 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 ); @@ -333,6 +336,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 ); @@ -450,6 +455,7 @@
[Libreoffice-commits] .: desktop/Library_spl.mk
desktop/Library_spl.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 5cc45ed66d44aec84dcaf3f3cd58a4fb26efe4ba Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Dec 28 21:53:31 2011 +0100 desktop: spl: do not pointlessly include object file diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index be7de6d..69f96b2 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_linked_libs,spl,\ $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) $(eval $(call gb_Library_add_exception_objects,spl,\ -desktop/source/migration/migration \ desktop/source/splash/services_spl \ desktop/source/splash/splash \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/inc sw/source
sw/inc/crsrsh.hxx |1
sw/inc/viewsh.hxx | 21 +++-
sw/source/core/crsr/crsrsh.cxx |8 -
sw/source/core/inc/pagefrm.hxx |5 -
sw/source/core/layout/pagechg.cxx | 22 -
sw/source/core/layout/paintfrm.cxx | 47 ++
sw/source/core/view/viewsh.cxx | 21 +++-
sw/source/core/view/vnew.cxx|9 +-
sw/source/ui/docvw/FrameControlsManager.cxx |9 +-
sw/source/ui/docvw/HeaderFooterWin.cxx | 19 +++-
sw/source/ui/docvw/PageBreakWin.cxx | 19 +++-
sw/source/ui/docvw/edtwin.cxx | 121 ++--
sw/source/ui/inc/FrameControl.hxx |4
sw/source/ui/inc/FrameControlsManager.hxx | 11 --
sw/source/ui/inc/HeaderFooterWin.hxx|3
sw/source/ui/inc/PageBreakWin.hxx |3
sw/source/ui/inc/edtwin.hxx | 14 +--
sw/source/ui/inc/wrtsh.hxx |2
sw/source/ui/wrtsh/wrtsh1.cxx |6 -
19 files changed, 211 insertions(+), 134 deletions(-)
New commits:
commit cce76e658af88813e17dea4f04388a29d7e582df
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 29 13:42:43 2011 +0100
Header/Footer: When editing, show only the appropriate conrol.
Instead of showing both the header and footer controls, show only the
footer-related if in footer, or header-related if in header.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index fd4a3d6..85b17a4 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -92,6 +92,12 @@ namespace vcl
class OldStylePrintAdaptor;
}
+enum FrameControlType
+{
+PageBreak,
+Header,
+Footer
+};
// Define for flags needed in ctor or layers below.
// Currently the PreView flag is needed for DrawPage.
@@ -156,9 +162,10 @@ class SW_DLLPUBLIC ViewShell : public Ring
sal_Bool bEnableSmooth:1; // Disable SmoothScroll, e.g. for drag
// of scrollbars.
sal_Bool bEndActionByVirDev:1; // Paints from EndAction always via
virtual device
-bool bShowHeaderFooterSeparator:1;
-bool bHeaderFooterEdit:1;
// (e.g. when browsing).
+bool bShowHeaderSeparator:1; // Flag to say that we are showing the
header control
+bool bShowFooterSeparator:1; // Flag to say that we are showing the
footer control
+bool bHeaderFooterEdit:1; // Flag to say that we are editing header
or footer (according to the bShow(Header|Footer)Separator above)
// boolean, indicating that class in in constructor.
bool mbInConstructor:1;
@@ -565,10 +572,12 @@ public:
const SwPostItMgr* GetPostItMgr() const { return
(const_castViewShell*(this))-GetPostItMgr(); }
SwPostItMgr* GetPostItMgr();
-void ToggleHeaderFooterEdit( );
+/// Acts both for headers / footers, depending on the
bShow(Header|Footer)Separator flags
+void ToggleHeaderFooterEdit();
+/// Acts both for headers / footers, depending on the
bShow(Header|Footer)Separator flags
bool IsHeaderFooterEdit() const { return bHeaderFooterEdit; }
-bool IsShowHeaderFooterSeparator() { return bShowHeaderFooterSeparator; }
-virtual void SetShowHeaderFooterSeparator( bool bShow ) {
bShowHeaderFooterSeparator = bShow; }
+bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return
(eControl == Header)? bShowHeaderSeparator: bShowFooterSeparator; }
+virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool
bShow ) { if ( eControl == Header ) bShowHeaderSeparator = bShow; else
bShowFooterSeparator = bShow; }
};
// class CurrShell manages global ShellPointer ---
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index bb55f6b..0d1efa3 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1316,7 +1316,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool
bIdleEnd )
}
if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
-ToggleHeaderFooterEdit( );
+ToggleHeaderFooterEdit();
// #i27301#
SwNotifyAccAboutInvalidTextSelections aInvalidateTextSelections( *this );
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 1e16a98..779c4cd 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -28,7 +28,7 @@
#ifndef _PAGEFRM_HXX
#define _PAGEFRM_HXX
-
+#include viewsh.hxx
#include svl/svarray.hxx
#include ftnboss.hxx
@@ -359,7 +359,8 @@ public:
// in case this is am empty page, this function returns the 'reference'
page
const SwPageFrm GetFormatPage() const;
-bool IsOverHeaderFooterArea( const Point rPt ) const;
+/// If in header or footer area, it also indicates the exact area in
rControl.
+bool IsOverHeaderFooterArea( const Point rPt, FrameControlType
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e41996b5693414c0887c2c4d929cd16f4eb4577
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Dec 29 11:53:28 2011 +0100
Some cppcheck cleaning
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 95895e8..ad4b03e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -245,7 +245,7 @@ xub_StrLen lcl_getMinPos( xub_StrLen pos1, xub_StrLen pos2 )
min = pos2;
else if ( pos2 == STRING_NOTFOUND pos1 != STRING_NOTFOUND )
min = pos1;
-else if ( pos2 != STRING_NOTFOUND pos2 != STRING_NOTFOUND )
+else if ( pos1 != STRING_NOTFOUND pos2 != STRING_NOTFOUND )
{
if ( pos1 pos2 )
min = pos1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: default_images/cmd default_images/fpicker default_images/sw fpicker/source icon-themes/hicontrast icon-themes/oxygen svtools/source
dev/null|binary
fpicker/source/office/iodlg.hrc | 12 +---
fpicker/source/office/iodlg.src | 16
svtools/source/inc/iodlg.hrc| 12 +---
4 files changed, 10 insertions(+), 30 deletions(-)
New commits:
commit e220f41cb2486d2ad101d98e48fbbc40c9fd08c3
Author: Gustavo Buzzatti Pacheco gbpach...@gmail.com
Date: Thu Dec 29 20:13:55 2011 +0100
EasyHack fdo#42454, remove code associated with unused icons
diff --git a/default_images/cmd/lc_splitparentvertical.png
b/default_images/cmd/lc_splitparentvertical.png
deleted file mode 100644
index a36adb4..000
Binary files a/default_images/cmd/lc_splitparentvertical.png and /dev/null
differ
diff --git a/default_images/fpicker/res/list.png
b/default_images/fpicker/res/list.png
deleted file mode 100644
index 2438714..000
Binary files a/default_images/fpicker/res/list.png and /dev/null differ
diff --git a/default_images/sw/res/anchor.png b/default_images/sw/res/anchor.png
deleted file mode 100644
index eba7b9c..000
Binary files a/default_images/sw/res/anchor.png and /dev/null differ
diff --git a/default_images/sw/res/danchor.png
b/default_images/sw/res/danchor.png
deleted file mode 100644
index eba7b9c..000
Binary files a/default_images/sw/res/danchor.png and /dev/null differ
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 42b235e..353314e 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -35,13 +35,11 @@
#define FT_EXPLORERFILE_CURRENTPATH 10
#define BTN_EXPLORERFILE_NEWFOLDER 11
-#define BTN_EXPLORERFILE_LISTVIEW 12
-#define BTN_EXPLORERFILE_DETAILSVIEW13
-#define BTN_EXPLORERFILE_UP 14
-#define BTN_EXPLORERFILE_STANDARD 15
-#define BTN_EXPLORERFILE_OPEN 16
-#define BTN_EXPLORERFILE_CANCEL 17
-#define BTN_EXPLORERFILE_HELP 18
+#define BTN_EXPLORERFILE_UP 12
+#define BTN_EXPLORERFILE_STANDARD 13
+#define BTN_EXPLORERFILE_OPEN 14
+#define BTN_EXPLORERFILE_CANCEL 15
+#define BTN_EXPLORERFILE_HELP 16
#define IMG_FILEDLG_BTN_UP 10
#define IMG_FILEDLG_BTN_STD 11
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index da11eb5..b30bf7e 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -77,22 +77,6 @@ ModalDialog DLG_SVT_EXPLORERFILE
Pos = MAP_APPFONT ( 59 , 6 ) ;
QuickHelpText [ en-US ] = Create New Directory ;
};
-ImageButton BTN_EXPLORERFILE_LISTVIEW
-{
-HelpID =
fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW;
-TabStop = FALSE ;
-Pos = MAP_APPFONT ( 109 , 6 ) ;
-ButtonImage = Image
-{
-ImageBitmap = Bitmap
-{
-File = list.bmp ;
-};
-MASKCOLOR
-};
-QuickHelpText [ en-US ] = List;
-};
-HelpID =
fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW;
MenuButton BTN_EXPLORERFILE_UP
{
HelpID = fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP;
diff --git a/icon-themes/hicontrast/cmd/lc_splitparentvertical.png
b/icon-themes/hicontrast/cmd/lc_splitparentvertical.png
deleted file mode 100644
index a36adb4..000
Binary files a/icon-themes/hicontrast/cmd/lc_splitparentvertical.png and
/dev/null differ
diff --git a/icon-themes/hicontrast/cmd/sc_splitparentvertical.png
b/icon-themes/hicontrast/cmd/sc_splitparentvertical.png
deleted file mode 100644
index 82c928b..000
Binary files a/icon-themes/hicontrast/cmd/sc_splitparentvertical.png and
/dev/null differ
diff --git a/icon-themes/oxygen/cmd/lch_splitparentvertical.png
b/icon-themes/oxygen/cmd/lch_splitparentvertical.png
deleted file mode 100644
index aee93b9..000
Binary files a/icon-themes/oxygen/cmd/lch_splitparentvertical.png and /dev/null
differ
diff --git a/icon-themes/oxygen/cmd/sch_splitparentvertical.png
b/icon-themes/oxygen/cmd/sch_splitparentvertical.png
deleted file mode 100644
index 444b77f..000
Binary files a/icon-themes/oxygen/cmd/sch_splitparentvertical.png and /dev/null
differ
diff --git a/icon-themes/oxygen/res/lxh03241.png
b/icon-themes/oxygen/res/lxh03241.png
deleted file mode 100644
index 33776d7..000
Binary files a/icon-themes/oxygen/res/lxh03241.png and /dev/null differ
diff --git a/icon-themes/oxygen/res/sxh03241.png
b/icon-themes/oxygen/res/sxh03241.png
deleted file mode 100644
index 444b77f..000
Binary files a/icon-themes/oxygen/res/sxh03241.png and /dev/null differ
diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index b94d0df..a3ea385 100644
--- a/svtools/source/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.hrc
@@ -34,13 +34,11 @@
#define FT_EXPLORERFILE_CURRENTPATH 10
#define
[Libreoffice-commits] .: starmath/source
starmath/source/mathmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 74b675cb6988c8ea731536832a0f8b5196f7521e
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Dec 29 11:35:59 2011 +0100
Some cppcheck cleaning
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index f8b3b38..8c456e4 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1160,7 +1160,7 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode,
int nLevel)
static bool lcl_HasEffectOnMathvariant( const SmTokenType eType )
{
return eType == TBOLD || eType == TNBOLD ||
-eType == TITALIC || eType == TNBOLD ||
+eType == TITALIC || eType == TNITALIC ||
eType == TSANS || eType == TSERIF || eType == TFIXED;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
