diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-05-02 17:40:10 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-05-02 17:42:24 +0200 |
| commit | 042da092165eea856596db5ba5f18ea1273b88eb (patch) | |
| tree | 3a29cb7130c059e277df8d7eeb61a7c32db03fa1 /sw/inc | |
| parent | b1419d37db297a4228bb0df463a1ab06c0c6183d (diff) | |
finish handling of w:pStyle in numbering (bnc#751028)
Now each such numbering should be properly assigned to the given paragraph
style.
Change-Id: I97a796dfb3f4a46f0fee0663852b3a40c3eaa922
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/unoprnms.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/unosett.hxx | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 38911ccf386d..a27dc3ab251e 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -814,7 +814,9 @@ enum SwPropNameIds /* 0749 */ UNO_NAME_PARA_CONTEXT_MARGIN, -/* 0750 */ SW_PROPNAME_END +/* 0750 */ UNO_NAME_PARAGRAPH_STYLE_NAME, + +/* 0751 */ SW_PROPNAME_END // new items in this array must match SwPropNameTab aPropNameTab }; diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index a3073f261894..564ede44db75 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -154,7 +154,7 @@ class SwXNumberingRules : public cppu::WeakAggImplHelper5 String sNewCharStyleNames[MAXLEVEL]; String sNewBulletFontNames[MAXLEVEL]; String sCreatedNumRuleName; //connects to a numbering in SwDoc - SwDoc* pDoc; // Only needed for registration. + SwDoc* pDoc; SwDocShell* pDocShell; // Only if used as chapter numbering. SwNumRule* pNumRule; const SfxItemPropertySet* m_pPropertySet; @@ -167,7 +167,7 @@ protected: public: SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering - SwXNumberingRules(const SwNumRule& rRule); // NumRule for paragraphs, numbering styles + SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc = NULL); // NumRule for paragraphs, numbering styles SwXNumberingRules(SwDoc& rDoc); //create a new instance |