[Libreoffice-commits] .: 3 commits - sw/inc sw/source unusedcode.easy
sw/inc/swurl.hxx | 12 ++ sw/source/core/access/acchyperlink.cxx |4 +-- sw/source/core/text/txtftn.cxx |3 -- sw/source/ui/app/docstyle.cxx|5 ++-- sw/source/ui/docvw/SidebarTxtControl.cxx |2 - sw/source/ui/docvw/edtwin.cxx|2 - sw/source/ui/docvw/romenu.cxx|2 - sw/source/ui/fldui/xfldui.cxx|2 - sw/source/ui/wrtsh/wrtsh2.cxx| 36 +-- unusedcode.easy | 28 ++-- 10 files changed, 36 insertions(+), 60 deletions(-) New commits: commit 16fc0fdb9008ffc48a6a363ffcd50555835a3857 Author: Caolán McNamara Date: Fri Apr 6 22:38:16 2012 +0100 callcatcher: update unused code diff --git a/unusedcode.easy b/unusedcode.easy index 91368d3..cb5c9fe 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -775,7 +775,6 @@ dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString dbtools::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Any const&) dp_misc::TRACE(rtl::OString const&) dp_misc::writeConsoleError(rtl::OString const&) -drawinglayer::attribute::SdrFillTextAttribute::isDefault() const drawinglayer::attribute::SdrFormTextAttribute::getFormTextShdwTransp() const drawinglayer::attribute::SdrTextAttribute::getPropertiesVersion() const drawinglayer::attribute::SdrTextAttribute::isWrongSpell() const @@ -799,25 +798,15 @@ oox::PropertyMap::dump(com::sun::star::uno::Reference const&) oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) const -oox::dump::Output::writeAddress(oox::dump::Address const&) +oox::dump::InputObjectBase::dumpNullCharArray(oox::dump::String const&, unsigned short) +oox::dump::InputObjectBase::dumpNullUnicodeArray(oox::dump::String const&) +oox::dump::Output::writeColRange(int, int) +oox::dump::Output::writeColRowRange(int, int) oox::dump::Output::writeColorABGR(int) -oox::dump::Output::writeRange(oox::dump::Range const&) -oox::dump::Output::writeRangeList(std::__debug::vector > const&) -oox::dump::OutputObjectBase::writeAddressItem(oox::dump::String const&, oox::dump::Address const&) -oox::dump::OutputObjectBase::writeColIndexItem(oox::dump::String const&, int) -oox::dump::OutputObjectBase::writeColRangeItem(oox::dump::String const&, int, int) -oox::dump::OutputObjectBase::writeRangeItem(oox::dump::String const&, oox::dump::Range const&) -oox::dump::OutputObjectBase::writeRangeListItem(oox::dump::String const&, std::__debug::vector > const&) -oox::dump::OutputObjectBase::writeRowIndexItem(oox::dump::String const&, int) -oox::dump::OutputObjectBase::writeRowRangeItem(oox::dump::String const&, int, int) -oox::dump::OutputObjectBase::writeTokenAddress3dItem(oox::dump::String const&, rtl::OUString const&, oox::dump::TokenAddress const&, bool) -oox::dump::OutputObjectBase::writeTokenAddressItem(oox::dump::String const&, oox::dump::TokenAddress const&, bool) -oox::dump::OutputObjectBase::writeTokenRange3dItem(oox::dump::String const&, rtl::OUString const&, oox::dump::TokenRange const&, bool) -oox::dump::OutputObjectBase::writeTokenRangeItem(oox::dump::String const&, oox::dump::TokenRange const&, bool) +oox::dump::Output::writeRowRange(int, int) oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&) -oox::dump::StdHlinkObject::StdHlinkObject(oox::dump::InputObjectBase const&) -oox::dump::StringHelper::appendToken(rtl::OUStringBuffer&, long, unsigned short) -oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, unsigned short) +oox::dump::StringHelper::appendRange(rtl::OUStringBuffer&, oox::dump::TokenRange const&, bool) +oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer&, std::__debug::vector > const&) oox::ole::OleHelper::importStdHlink(oox::ole::StdHlinkInfo&, oox::BinaryInputStream&, bool) oox::xls::BiffAutoFilterContext::BiffAutoFilterContext(oox::xls::WorksheetHelper const&, oox::xls::AutoFilter&) oox::xls::BiffCodecHelper::implReadFilePass(oox::xls::BiffInputStream&, oox::xls::BiffType) @@ -889,9 +878,6 @@ sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::View::LockRedraw(unsigned char) sd::ViewShellBase::RegisterFactory(unsigned short) -sd::framework::ConfigurationClassifier::GetC1andC2() const -sd::framework::ConfigurationClassifier::TraceResourceIdVector(char const*, std::__debug::vector, std::allocator > > const&) const -sd::framework::ConfigurationTracer::TraceConfiguration(com::sun::star::uno::Reference const&, char const*) sd::slidesorter::cache::GenericPageCache::ReleasePreviewBitmap(SdrPage const*) sd::slidesorter::cont
[Libreoffice-commits] .: 3 commits - sw/inc sw/source
sw/inc/editsh.hxx | 38 +++-
sw/source/core/edit/edattr.cxx | 63 +++
sw/source/ui/inc/formatclipboard.hxx|7
sw/source/ui/uiview/formatclipboard.cxx | 270 ++--
4 files changed, 258 insertions(+), 120 deletions(-)
New commits:
commit 357fac9713875302d30185feabaf5c165e040ca4
Author: Maxime de Roucy
Date: Wed Mar 14 16:07:57 2012 +0100
Rewrite of the format paintbrush
With this patch the format paintbrush differentiate automatic character
attributes apply to character than those apply to paragraph.
Character attributes applied to paragraph are treat as paragraph format
when paragraph format are copied (and so apply to paragraph), and treat
as character format when paragraph format are not copied.
It also change the behavior of the format paintbrush on "restart
numbering" and "restart numbering at" attributes. With this patch those
attributes are simply copied⦠as expected.
diff --git a/sw/source/ui/inc/formatclipboard.hxx
b/sw/source/ui/inc/formatclipboard.hxx
index 4cca4e7..aa89f99 100644
--- a/sw/source/ui/inc/formatclipboard.hxx
+++ b/sw/source/ui/inc/formatclipboard.hxx
@@ -81,8 +81,11 @@ public:
private:
int m_nSelectionType;
-/** automatic/named character and paragraph attribute set */
-SfxItemSet* m_pItemSet;
+/** automatic/named character attribute set */
+SfxItemSet* m_pItemSet_TxtAttr;
+/** automatic/named paragraph attribute set
+ * (it can be caractere attribute applyied to the paragraph) */
+SfxItemSet* m_pItemSet_ParAttr;
/** table attribute set */
SfxItemSet* m_pTableItemSet;
diff --git a/sw/source/ui/uiview/formatclipboard.cxx
b/sw/source/ui/uiview/formatclipboard.cxx
index 61dfd31..8b09cba 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -84,12 +84,9 @@ RES_TEXTGRID, RES_FRMATR_END-1,
#define FORMAT_PAINTBRUSH_PARAGRAPH_IDS \
RES_PARATR_BEGIN, RES_PARATR_END -1, \
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END -1, \
-FORMAT_PAINTBRUSH_FRAME_IDS \
-FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART, \
-FN_NUMBER_NEWSTART_AT, FN_NUMBER_NEWSTART_AT,
+FORMAT_PAINTBRUSH_FRAME_IDS
-SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool
-, bool bNoCharacterFormats = false, bool bNoParagraphFormats =
false )
+SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool,
bool bNoParagraphFormats = false )
{
SfxItemSet* pItemSet = 0;
if( nSelectionType & (nsSelectionType::SEL_FRM | nsSelectionType::SEL_OLE
| nsSelectionType::SEL_GRF) )
@@ -102,30 +99,9 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType,
SfxItemPool& rPool
{
//is handled different
}
-else if( nSelectionType == nsSelectionType::SEL_TBL )
-{
-pItemSet = new SfxItemSet(rPool,
-SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW,
//SID_ATTR_BORDER_OUTER is inbetween
-RES_BACKGROUND, RES_SHADOW, //RES_BOX is
inbetween
-SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE,
-RES_BREAK, RES_BREAK,
-RES_PAGEDESC, RES_PAGEDESC,
-RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
-RES_ROW_SPLIT, RES_ROW_SPLIT,
-RES_KEEP, RES_KEEP,
-RES_FRAMEDIR, RES_FRAMEDIR,
-FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
-FN_TABLE_BOX_TEXTORIENTATION,
FN_TABLE_BOX_TEXTORIENTATION,
-FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
-0);
-}
else if( nSelectionType & nsSelectionType::SEL_TXT )
{
-if( bNoCharacterFormats )
-pItemSet = new SfxItemSet(rPool,
-FORMAT_PAINTBRUSH_PARAGRAPH_IDS
-0);
-else if( bNoParagraphFormats )
+if( bNoParagraphFormats )
pItemSet = new SfxItemSet(rPool,
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
0);
@@ -270,20 +246,23 @@ void lcl_setTableAttributes( const SfxItemSet& rSet,
SwWrtShell &rSh )
SwFormatClipboard::SwFormatClipboard()
: m_nSelectionType(0)
-, m_pItemSet(0)
+, m_pItemSet_TxtAttr(0)
+, m_pItemSet_ParAttr(0)
, m_pTableItemSet(0)
, m_bPersistentCopy(false)
{
}
SwFormatClipboard::~SwFormatClipboard()
{
-delete m_pItemSet;
+delete m_pItemSet_TxtAttr;
+delete m_pItemSet_ParAttr;
delete m_pTableItemSet;
}
bool SwFormatClipboard::HasContent() const
{
-return m_pItemSet!=0
+return m_pItemSet_TxtAttr!=0
+|| m_pItemSet_ParAttr!=0
|| m_pTableItemSet != 0
|| m_aCharStyle.Len()
|| m_aParaStyle.Len
[Libreoffice-commits] .: 3 commits - sw/inc sw/source
sw/inc/SwXMLSectionList.hxx |6 +-
sw/inc/shellio.hxx |6 +-
sw/inc/swunohelper.hxx |6 +-
sw/source/core/swg/SwXMLSectionList.cxx |9 +--
sw/source/core/unocore/swunohelper.cxx |8 +-
sw/source/core/unocore/unofield.cxx | 18 ++
sw/source/filter/basflt/shellio.cxx |2
sw/source/filter/inc/fltini.hxx |4 -
sw/source/filter/xml/swxml.cxx | 12 +---
sw/source/ui/dialog/uiregionsw.cxx | 10 +--
sw/source/ui/inc/glosdoc.hxx| 11 +--
sw/source/ui/misc/glosdoc.cxx | 89
sw/source/ui/utlui/gloslst.cxx | 10 +--
13 files changed, 80 insertions(+), 111 deletions(-)
New commits:
commit 3fb612cb206a989c0749ac509b173ec01eb3f49e
Author: Brad Sowden
Date: Thu Dec 29 22:26:57 2011 +1300
Easyhack fdo#38831 remove SvStrings
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 6b0ddc7..2e4785f 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -85,7 +85,6 @@
#include
#include
#include
-#define _SVSTDARR_STRINGS
#include
#include
#include
@@ -95,6 +94,7 @@
#include // MetaFieldManager
#include
#include
+#include
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -2539,32 +2539,30 @@ uno::Sequence< OUString >
SwXTextFieldMasters::getElementNames(void)
const SwFldTypes* pFldTypes = GetDoc()->GetFldTypes();
sal_uInt16 nCount = pFldTypes->Count();
-SvStrings aFldNames;
+std::vector aFldNames;
String* pString = new String();
-sal_uInt16 i;
-for( i = 0; i < nCount; i++)
+for( sal_uInt16 i = 0; i < nCount; i++)
{
SwFieldType& rFldType = *((*pFldTypes)[i]);
if (SwXTextFieldMasters::getInstanceName(rFldType, *pString))
{
-aFldNames.Insert(pString, aFldNames.Count());
+aFldNames.push_back(pString);
pString = new String();
}
}
delete pString;
-uno::Sequence< OUString > aSeq(aFldNames.Count());
+uno::Sequence< OUString > aSeq( static_cast(aFldNames.size())
);
OUString* pArray = aSeq.getArray();
-for(i = 0; i < aFldNames.Count();i++)
+for(sal_uInt16 i = 0; i < aFldNames.size();i++)
{
-pArray[i] = *aFldNames.GetObject(i);
+pArray[i] = *aFldNames[i];
+delete aFldNames[i];
}
-aFldNames.DeleteAndDestroy(0, aFldNames.Count());
return aSeq;
-
}
sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw(
uno::RuntimeException )
commit 9e192c9fd1c0ddc0cd9b926a46f4144f1bf71526
Author: Brad Sowden
Date: Thu Dec 29 22:26:06 2011 +1300
Easyhack fdo#38831 remove SvStrings
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 0467864..c59fda7 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -31,7 +31,7 @@
#include
#include
-class SvStrings;
+class vector;
class SwXMLSectionList : public SvXMLImport
{
@@ -43,11 +43,11 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
public:
-SvStrings & rSectionList;
+std::vector &rSectionList;
SwXMLSectionList(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
-SvStrings & rNewSectionList );
+std::vector &rNewSectionList );
virtual ~SwXMLSectionList ( )
throw();
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 56cd063..0b91804 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -56,7 +56,6 @@ class SfxItemSet;
class SfxMedium;
class SvPtrarr;
class SvStream;
-class SvStrings;
class SvxFontItem;
class SvxMacroTableDtor;
class SwCntntNode;
@@ -64,6 +63,7 @@ class SwCrsrShell;
class SwDoc;
class SwPaM;
class SwTextBlocks;
+class vector;
struct SwPosition;
struct Writer_Impl;
@@ -272,8 +272,8 @@ public:
// Read the sections of the document, which is equal to the medium.
// Returns the count of it
-virtual sal_uInt16 GetSectionList( SfxMedium& rMedium,
-SvStrings& rStrings ) const;
+virtual size_t GetSectionList( SfxMedium& rMedium,
+ std::vector& rStrings ) const;
SotStorageRef getSotStorageRef() { return pStg; };
void setSotStorageRef(SotStorageRef pStgRef) { pStg = pStgRef; };
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx
b/sw/source/core/swg/SwXMLSectionList.cxx
index 1d00774..3a1adfd 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -26,12 +26,11 @@
*
/
-#define _SVSTDARR_STRINGSDTOR
-#define _SVSTDARR_STRINGS
-#include
#include
#include
#incl
[Libreoffice-commits] .: 3 commits - sw/inc sw/source
sw/inc/doc.hxx |2 --
sw/inc/ndarr.hxx|2 --
sw/inc/ndtxt.hxx|2 --
sw/inc/node.hxx |4
sw/source/core/docnode/nodedump.cxx |7 +++
sw/source/core/layout/trvlfrm.cxx |6 --
sw/source/filter/ww8/WW8Sttbf.cxx |2 +-
sw/source/ui/docvw/edtwin.cxx |4 +---
8 files changed, 9 insertions(+), 20 deletions(-)
New commits:
commit 8e17c11e25d7e0ecd3a8a5ab4a4a3bd98d8c81b7
Author: Cédric Bosdonnat
Date: Tue Dec 13 17:25:51 2011 +0100
n#676858: Fix selection of background pictures vs text
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 4b54a68..d2c3d4e 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -78,7 +79,8 @@ namespace {
static_cast(aIter());
const SwAnchoredObject* pAnchoredObj = GetUserCall( aIter()
)->GetAnchoredObj( aIter() );
const SwFmtSurround& rSurround =
pAnchoredObj->GetFrmFmt().GetSurround();
-bool bInBackground = ( rSurround.GetSurround() ==
SURROUND_THROUGHT );
+const SvxOpaqueItem& rOpaque =
pAnchoredObj->GetFrmFmt().GetOpaque();
+bool bInBackground = ( rSurround.GetSurround() ==
SURROUND_THROUGHT ) && !rOpaque.GetValue();
bool bBackgroundMatches = ( bInBackground && bSearchBackground ) ||
( !bInBackground && !bSearchBackground );
@@ -274,7 +276,7 @@ sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point
&rPoint,
}
// TODO Pick up the best approaching selection
-if ( bTextRet && bBackRet && ( nTextSurface < nBackSurface ) )
+if ( bTextRet && bBackRet && ( nTextSurface > nBackSurface ) )
{
bRet = bBackRet;
pPos->nNode = aBackPos.nNode;
commit 3c1bc2311c297bbabba45e62e123d44061bd348c
Author: Cédric Bosdonnat
Date: Tue Dec 13 18:21:52 2011 +0100
sw: build hidden debug features in all cases
To activate the layout and node dumping features in sw, set the SW_DEBUG
environement variable to anything before running the office. F12 will
then dump the layout as a layout.xml file in the working directory, and
Shift+F12 will dump the nodes structure as nodes.xml at the same place.
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8165a57..c7255d9 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2038,13 +2038,11 @@ public:
::sw::UndoManager const& GetUndoManager() const;
SfxObjectShell* CreateCopy(bool bCallInitNew) const;
-#ifdef DBG_UTIL
/**
* Dumps the entire nodes structure to the given destination (file
nodes.xml in the current directory by default)
* @since 3.5
*/
void dumpAsXml( xmlTextWriterPtr writer = NULL );
-#endif
/// must be called only in SwDocShell::InitNew, causes UpdateDrawDefaults
to be called when drawing layer is created
void SetDrawDefaults();
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 389069b..d560637 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -337,13 +337,11 @@ public:
SwNode * DocumentSectionStartNode(SwNode * pNode) const;
SwNode * DocumentSectionEndNode(SwNode * pNode) const;
-#ifdef DBG_UTIL
/**
* Dumps the entire nodes structure to the given destination (file
nodes.xml in the current directory by default)
* @since 3.5
*/
void dumpAsXml( xmlTextWriterPtr writer = NULL );
-#endif
};
#endif
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 52bae7a..b4a772d 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -801,9 +801,7 @@ public:
bool IsCollapse() const;
-#ifdef DBG_UTIL
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL );
-#endif
DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode)
};
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index bbe3c59..f75091a 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -292,13 +292,11 @@ public:
sal_uInt8 HasPrevNextLayNode() const;
-#ifdef DBG_UTIL
/**
* Dumps the node structure to the given destination (file nodes.xml in
the current directory by default)
* @since 3.5
*/
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL );
-#endif
private:
// Private constructor because copying is never allowed!!
@@ -333,9 +331,7 @@ public:
// Call ChkCondcoll to all ContentNodes of section.
void CheckSectionCondColl() const;
-#ifdef DBG_UTIL
virtual void dumpAsXml( xmlTextWriterPtr writer = NULL );
-#endif
private:
// Private constructor because copying is never allowed!!
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 0e723ce..447967c 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cx
[Libreoffice-commits] .: 3 commits - sw/inc sw/source
sw/inc/fldbas.hxx |4 ++-- sw/inc/fldui.hrc | 28 +++- sw/source/ui/fldui/fldmgr.cxx |3 ++- 3 files changed, 19 insertions(+), 16 deletions(-) New commits: commit 392f0990e4b7ef7338aa901735c7a6cc7632dd40 Author: Caolán McNamara Date: Tue Dec 6 16:18:37 2011 + avoid assertion about spurious '0' translation id in field dialog diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index e67d170..7cd374f 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1648,7 +1648,8 @@ void SwFieldType::_GetFldName() STR_SCRIPTFLD, STR_AUTHORITY, STR_COMBINED_CHARS, -STR_DROPDOWN +STR_DROPDOWN, +STR_CUSTOM }; // insert infos for fields commit 84e6b5711978055be903f9541b4a9673cc07ed49 Author: Caolán McNamara Date: Tue Dec 6 16:09:57 2011 + order these against SwFldTypesEnum diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc index 7853e0e..52aa0ee 100644 --- a/sw/inc/fldui.hrc +++ b/sw/inc/fldui.hrc @@ -45,7 +45,7 @@ #define DLG_FLD_DROPDOWN(RC_FLDDLG_BEGIN + 12) /* -TypeId +TypeId, see SwFldTypesEnum */ #define STR_TYPE_BEGIN RC_FLDDLG_BEGIN @@ -60,27 +60,28 @@ #define STR_SETFLD (STR_TYPE_BEGIN + 8) #define STR_GETFLD (STR_TYPE_BEGIN + 9) #define STR_FORMELFLD (STR_TYPE_BEGIN + 10) -#define STR_CONDTXTFLD (STR_TYPE_BEGIN + 11) +#define STR_HIDDENTXTFLD(STR_TYPE_BEGIN + 11) #define STR_SETREFFLD (STR_TYPE_BEGIN + 12) #define STR_GETREFFLD (STR_TYPE_BEGIN + 13) #define STR_DDEFLD (STR_TYPE_BEGIN + 14) #define STR_MACROFLD(STR_TYPE_BEGIN + 15) #define STR_INPUTFLD(STR_TYPE_BEGIN + 16) -#define STR_DOCINFOFLD (STR_TYPE_BEGIN + 17) +#define STR_HIDDENPARAFLD (STR_TYPE_BEGIN + 17) +#define STR_DOCINFOFLD (STR_TYPE_BEGIN + 18) #define STR_DBFLD (STR_TYPE_BEGIN + 19) #define STR_USERFLD (STR_TYPE_BEGIN + 20) #define STR_POSTITFLD (STR_TYPE_BEGIN + 21) -#define STR_HIDDENPARAFLD (STR_TYPE_BEGIN + 22) - -#define STR_TEMPLNAMEFLD(STR_TYPE_BEGIN + 24) -#define STR_SEQFLD (STR_TYPE_BEGIN + 25) -#define STR_DBNEXTSETFLD(STR_TYPE_BEGIN + 26) -#define STR_DBNUMSETFLD (STR_TYPE_BEGIN + 27) -#define STR_DBSETNUMBERFLD (STR_TYPE_BEGIN + 28) +#define STR_TEMPLNAMEFLD(STR_TYPE_BEGIN + 22) +#define STR_SEQFLD (STR_TYPE_BEGIN + 23) +#define STR_DBNEXTSETFLD(STR_TYPE_BEGIN + 24) +#define STR_DBNUMSETFLD (STR_TYPE_BEGIN + 25) +#define STR_DBSETNUMBERFLD (STR_TYPE_BEGIN + 26) +#define STR_CONDTXTFLD (STR_TYPE_BEGIN + 27) +#define STR_NEXTPAGEFLD (STR_TYPE_BEGIN + 28) #define STR_PREVPAGEFLD (STR_TYPE_BEGIN + 29) -#define STR_NEXTPAGEFLD (STR_TYPE_BEGIN + 30) -#define STR_HIDDENTXTFLD(STR_TYPE_BEGIN + 31) -#define STR_EXTUSERFLD (STR_TYPE_BEGIN + 32) +#define STR_EXTUSERFLD (STR_TYPE_BEGIN + 30) + + #define STR_SETINPUTFLD (STR_TYPE_BEGIN + 33) #define STR_USRINPUTFLD (STR_TYPE_BEGIN + 34) #define STR_SETREFPAGEFLD (STR_TYPE_BEGIN + 35) @@ -91,6 +92,7 @@ #define STR_AUTHORITY (STR_TYPE_BEGIN + 40) #define STR_COMBINED_CHARS (STR_TYPE_BEGIN + 41) #define STR_DROPDOWN(STR_TYPE_BEGIN + 42) + #define STR_CUSTOM (STR_TYPE_BEGIN + 43) #define STR_TYPE_END(STR_TYPE_BEGIN + 44) commit c4f865061837179caee0959791512f9ff9cf0876 Author: Caolán McNamara Date: Tue Dec 6 16:07:26 2011 + comment of enum 40 misplaced diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index fb3de9c..f865175 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -129,8 +129,8 @@ enum SwFldTypesEnum TYP_GETREFPAGEFLD, TYP_INTERNETFLD, TYP_JUMPEDITFLD, -TYP_SCRIPTFLD, // 40 -TYP_AUTHORITY, +TYP_SCRIPTFLD, +TYP_AUTHORITY, // 40 TYP_COMBINED_CHARS, TYP_DROPDOWN, TYP_END ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1 +
sw/inc/doc.hxx |1 +
sw/source/core/doc/dbgoutsw.cxx|6 +++---
sw/source/core/doc/doc.cxx |5 +
sw/source/core/doc/docnew.cxx |1 +
sw/source/core/text/guess.cxx |8 ++--
sw/source/filter/ww8/ww8par.cxx|1 +
sw/source/filter/xml/xmlimp.cxx| 10 ++
sw/source/ui/uno/SwXDocumentSettings.cxx | 16 +++-
writerfilter/source/filter/ImportFilter.cxx|9 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4
11 files changed, 56 insertions(+), 6 deletions(-)
New commits:
commit 8a232f007458c9f474c6bf8fdf1f7f2c5ae467cf
Author: Cédric Bosdonnat
Date: Fri Nov 11 22:11:58 2011 +0100
RTF import: Fixed unicode characters import, fdo#42109
Actually implemented the \uc to skip the ANSI representation after the
unicode value.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9cc025c..7ba5249 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2221,6 +2221,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
}
}
break;
+case RTF_UC:
+if ((SAL_MIN_INT16 <= nParam) && (nParam <= SAL_MAX_INT16))
+m_aStates.top().nUc = nParam;
+break;
case RTF_U:
if ((SAL_MIN_INT16 <= nParam) && (nParam <= SAL_MAX_INT16))
{
commit 74b6759ee81c95ae75046dd411d2bd0bd2324a8b
Author: Cédric Bosdonnat
Date: Thu Nov 10 16:10:25 2011 +0100
n#707157: Word doesn't break the numberings and prefers hiding them
Added a compatibility option to reproduce Word's behavior when importing
Doc, docx and RTF files. The default behavior isn't changed.
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 50e8096..d912376 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -83,6 +83,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
COLLAPSE_EMPTY_CELL_PARA,
SMALL_CAPS_PERCENTAGE_66,
TAB_OVERFLOW,
+ UNBREAKABLE_NUMBERINGS,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e4848f5..8427b17 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -579,6 +579,7 @@ private:
bool mbTabAtLeftIndentForParagraphsInList; // #i89181# - see
above
bool mbSmallCapsPercentage66;
bool mbTabOverflow;
+bool mbUnbreakableNumberings;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index bdded6f..326cfde 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -203,6 +203,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case COLLAPSE_EMPTY_CELL_PARA: return mbCollapseEmptyCellPara;
case SMALL_CAPS_PERCENTAGE_66: return mbSmallCapsPercentage66;
case TAB_OVERFLOW: return mbTabOverflow;
+case UNBREAKABLE_NUMBERINGS: return mbUnbreakableNumberings;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
ViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
@@ -341,6 +342,10 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/
bool value)
case TAB_OVERFLOW:
mbTabOverflow = value;
break;
+
+case UNBREAKABLE_NUMBERINGS:
+mbUnbreakableNumberings = value;
+break;
// COMPATIBILITY FLAGS END
case BROWSE_MODE: //can be used temporary (load/save) when no
ViewShell is avaiable
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index f8a0ce2..656fb20 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -358,6 +358,7 @@ SwDoc::SwDoc()
mbCollapseEmptyCellPara = true;// hidden
mbSmallCapsPercentage66 = false;// hidden
mbTabOverflow = true;
+mbUnbreakableNumberings = false;
//
// COMPATIBILITY FLAGS END
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index bc84437..83c1758 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -125,8 +125,12 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor,
SwTxtFormatInfo &rInf,
if ( nLineWidth < 0 ) nLineWidth = 0;
}
+const bool bUnbreakableNumberings = rInf.GetTxtFrm()->GetTxtNode()->
+
getIDocumentSettingAccess()->get(IDocumentSettingAccess::UNBREAKABLE_NUMBERINGS);
+
// first check if everything f
[Libreoffice-commits] .: 3 commits - sw/inc sw/source
sw/inc/viewsh.hxx |2 +-
sw/source/core/layout/paintfrm.cxx |8
sw/source/ui/docvw/edtwin.cxx | 29 +++--
sw/source/ui/inc/wrtsh.hxx |1 +
sw/source/ui/wrtsh/wrtsh1.cxx |7 +++
5 files changed, 36 insertions(+), 11 deletions(-)
New commits:
commit 403305d593f98ea3af26dd48b3f342044efe9454
Author: Cédric Bosdonnat
Date: Fri Sep 16 17:03:35 2011 +0200
Header/Footer: Don't hide & show the separator windows all the time
This avoids permanent calls to the SwHeaderFooterWin::Paint method. The
loop is now broken and the cursor doesn't blink anymore.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 8c2cab8..241fb17 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -568,7 +568,7 @@ public:
void ToggleHeaderFooterEdit( );
sal_Bool IsHeaderFooterEdit( ) const { return bHeaderFooterEdit; }
sal_Bool IsShowHeaderFooterSeparator( ) { return
bShowHeaderFooterSeparator; }
-void SetShowHeaderFooterSeparator( sal_Bool bShow ) {
bShowHeaderFooterSeparator = bShow; }
+virtual void SetShowHeaderFooterSeparator( sal_Bool bShow ) {
bShowHeaderFooterSeparator = bShow; }
};
// class CurrShell manages global ShellPointer ---
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 9fa4aae..d923b55 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2782,14 +2782,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData
const*const pPrintData) const
else
SwRootFrm::bInPaint = bResetRootPaint = sal_True;
-SwWrtShell* pWrtSh = dynamic_cast< SwWrtShell* >( pSh );
-if ( pWrtSh )
-{
-SwEditWin& rEditWin = pWrtSh->GetView().GetEditWin();
-rEditWin.HideHeaderFooterControls( );
-}
-
-
SwSavePaintStatics *pStatics = 0;
if ( pGlobalShell )
pStatics = new SwSavePaintStatics();
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 50f7f05..f2e2e89 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5779,7 +5779,8 @@ void SwEditWin::SetHeaderFooterControl( const SwPageFrm*
pPageFrm, bool bHeader,
}
pControl->SetOffset( aOffset );
-pControl->Show( );
+if ( !pControl->IsVisible() )
+pControl->Show( );
}
void SwEditWin::RemoveHeaderFooterControls( const SwPageFrm* pPageFrm )
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 735848f..7d0bbfd 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -486,6 +486,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect =
sal_False);
void ChangeHeaderOrFooter(const String& rStyleName, sal_Bool bHeader,
sal_Bool bOn, sal_Bool bShowWarning);
+virtual void SetShowHeaderFooterSeparator( sal_Bool bShow );
private:
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index ec03fe4..ec54dc2 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -1890,4 +1890,11 @@ void SwWrtShell::ChangeHeaderOrFooter(
EndAllAction();
}
+void SwWrtShell::SetShowHeaderFooterSeparator( sal_Bool bShow )
+{
+ViewShell::SetShowHeaderFooterSeparator( bShow );
+if ( !bShow )
+GetView().GetEditWin().HideHeaderFooterControls( );
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 363591e7542232088606b8da6e55850b6c84c079
Author: Cédric Bosdonnat
Date: Fri Sep 16 11:37:02 2011 +0200
Header/Footer: mouse-over timer set down to 1s instead of 2s.
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index f69d2a8..50f7f05 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4603,7 +4603,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
aKeyInputFlushTimer.SetTimeout( 200 );
aKeyInputFlushTimer.SetTimeoutHdl(LINK(this, SwEditWin,
KeyInputFlushHandler));
-aOverHeaderFooterTimer.SetTimeout( 2000 );
+aOverHeaderFooterTimer.SetTimeout( 1000 );
aOverHeaderFooterTimer.SetTimeoutHdl(LINK(this, SwEditWin,
OverHeaderFooterHandler));
// TemplatePointer for colors should be resetted without
commit a9904f07de04dbfb2f81ac44ebb4caa88c16c6c1
Author: Cédric Bosdonnat
Date: Fri Sep 16 10:03:22 2011 +0200
Header/Footer: enable quickly hiding the separators
After having triggered the separators using a mouse-over, hide the
separator when clicking in the main body or typing.
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 5ea839e..f69d2a8 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1302,6 +1302,13 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
{
SwWrtShell &rSh = rView.GetWrtShell();
+// Hide the header/footer separator if not editin
