summaryrefslogtreecommitdiffstats
path: root/lib/kofficecore
diff options
context:
space:
mode:
Diffstat (limited to 'lib/kofficecore')
-rw-r--r--lib/kofficecore/KoDocument.cpp4
-rw-r--r--lib/kofficecore/KoDocument.h2
-rw-r--r--lib/kofficecore/KoDocumentChild.cpp2
-rw-r--r--lib/kofficecore/KoFilterManager.cpp6
-rw-r--r--lib/kofficecore/KoGenStyles.h2
-rw-r--r--lib/kofficecore/KoOasisStyles.cpp4
-rw-r--r--lib/kofficecore/KoOasisStyles.h6
-rw-r--r--lib/kofficecore/KoPageLayout.cpp30
-rw-r--r--lib/kofficecore/KoPageLayout.h8
-rw-r--r--lib/kofficecore/KoView.cpp2
-rw-r--r--lib/kofficecore/koDetailsPaneBase.ui2
-rw-r--r--lib/kofficecore/koDocumentInfoAboutWidget.ui8
-rw-r--r--lib/kofficecore/koDocumentInfoAuthorWidget.ui6
-rw-r--r--lib/kofficecore/koDocumentInfoUserMetadataWidget.ui2
-rw-r--r--lib/kofficecore/koOpenPaneBase.ui4
-rw-r--r--lib/kofficecore/tests/koxmlreadertest.cpp16
16 files changed, 52 insertions, 52 deletions
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index fd790991..f881293a 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -1222,7 +1222,7 @@ TQPixmap KoDocument::generatePreview( const TQSize& size )
docHeight = m_pageLayout.ptHeight / 72 * KoGlobal::dpiY();
} else {
- // If we don't have a page tqlayout, just draw the top left hand corner
+ // If we don't have a page layout, just draw the top left hand corner
docWidth = 500.0;
docHeight = 500.0;
}
@@ -2656,7 +2656,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent)
{
KDialogBase dlg(parent, "EmbedInitDialog", true, i18n("Embedding Object"), 0, KDialogBase::NoDefault);
KoOpenPane* pane = createOpenPane(&dlg, instance(), templateType());
- pane->tqlayout()->setMargin(0);
+ pane->layout()->setMargin(0);
dlg.setMainWidget(pane);
dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog"));
connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk()));
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index df1518de..1a5d0805 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -741,7 +741,7 @@ public:
virtual bool isStoredExtern() const;
/**
- * @return the page tqlayout associated with this document (margins, pageSize, etc).
+ * @return the page layout associated with this document (margins, pageSize, etc).
* Override this if you want to provide different sized pages.
*
* @see KoPageLayout
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 8c6fe16f..c71c7609 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -454,7 +454,7 @@ void KoDocumentChild::saveOasisAttributes( KoXmlWriter &xmlWriter, const TQStrin
d->m_doc->setURL( u );
}
- //<draw:object draw:style-name="standard" draw:id="1" draw:layer="tqlayout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+ //<draw:object draw:style-name="standard" draw:id="1" draw:layer="layout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
xmlWriter.addAttribute( "xlink:type", "simple" );
xmlWriter.addAttribute( "xlink:show", "embed" );
xmlWriter.addAttribute( "xlink:actuate", "onLoad" );
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index bcd56f75..f1bf2229 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -59,13 +59,13 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType
setMainWidget (page);
// looks too squashed together without * 2
- TQVBoxLayout *tqlayout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2);
+ TQVBoxLayout *layout = new TQVBoxLayout (page, marginHint (), spacingHint () * 2);
TQLabel *filterLabel = new TQLabel (i18n ("Select a filter:"), page, "filterlabel");
- tqlayout->addWidget (filterLabel);
+ layout->addWidget (filterLabel);
m_filterList = new KListBox (page, "filterlist");
- tqlayout->addWidget (m_filterList);
+ layout->addWidget (m_filterList);
Q_ASSERT (!m_mimeTypes.isEmpty ());
for (TQStringList::ConstIterator it = m_mimeTypes.begin ();
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index 2a54f944..d7516732 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -274,7 +274,7 @@ public:
{
/**
* DefaultType depends on family: e.g. paragraph-properties if family=paragraph
- * or on the type of style (e.g. page-tqlayout -> page-tqlayout-properties).
+ * or on the type of style (e.g. page-layout -> page-layout-properties).
* (In fact that tag name is the one passed to writeStyle)
*/
DefaultType = 0,
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index fe88a11b..0f173658 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -194,9 +194,9 @@ void KoOasisStyles::insertStyle( const TQDomElement& e, bool styleAutoStyles )
//kdDebug(30003) << "Style: '" << name << "' loaded " << endl;
}
} else if ( ns == KoXmlNS::style && (
- localName == "page-tqlayout"
+ localName == "page-layout"
|| localName == "font-decl"
- || localName == "presentation-page-tqlayout" ) )
+ || localName == "presentation-page-layout" ) )
{
if ( m_styles.find( name ) != 0 )
kdDebug(30003) << "Style: '" << name << "' already exists" << endl;
diff --git a/lib/kofficecore/KoOasisStyles.h b/lib/kofficecore/KoOasisStyles.h
index dfa9e468..e73eab0e 100644
--- a/lib/kofficecore/KoOasisStyles.h
+++ b/lib/kofficecore/KoOasisStyles.h
@@ -47,8 +47,8 @@ public:
/**
* Look up a style by name.
- * This method can find styles defined by the tags "style:page-tqlayout",
- * "style:presentation-page-tqlayout", or "style:font-decl".
+ * This method can find styles defined by the tags "style:page-layout",
+ * "style:presentation-page-layout", or "style:font-decl".
* Do NOT use this method for style:style styles.
*
* @param name the style name
@@ -148,7 +148,7 @@ private:
KoOasisStyles& operator=( const KoOasisStyles & ); // forbidden
private:
- TQDict<TQDomElement> m_styles; // page-tqlayout, font-decl etc.
+ TQDict<TQDomElement> m_styles; // page-layout, font-decl etc.
TQDict<TQDomElement> m_defaultStyle;
TQDomElement m_officeStyle;
diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp
index d01ca6db..c3965d45 100644
--- a/lib/kofficecore/KoPageLayout.cpp
+++ b/lib/kofficecore/KoPageLayout.cpp
@@ -59,7 +59,7 @@ KoGenStyle KoPageLayout::saveOasis() const
void KoPageLayout::loadOasis(const TQDomElement &style)
{
- TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-tqlayout-properties" ) );
+ TQDomElement properties( KoDom::namedItemNS( style, KoXmlNS::style, "page-layout-properties" ) );
if ( !properties.isNull() )
{
ptWidth = KoUnit::parseValue(properties.attributeNS( KoXmlNS::fo, "page-width", TQString() ) );
@@ -82,18 +82,18 @@ void KoPageLayout::loadOasis(const TQDomElement &style)
KoPageLayout KoPageLayout::standardLayout()
{
- KoPageLayout tqlayout;
- tqlayout.format = KoPageFormat::defaultFormat();
- tqlayout.orientation = PG_PORTRAIT;
- tqlayout.ptWidth = MM_TO_POINT( KoPageFormat::width( tqlayout.format, tqlayout.orientation ) );
- tqlayout.ptHeight = MM_TO_POINT( KoPageFormat::height( tqlayout.format, tqlayout.orientation ) );
- tqlayout.ptLeft = MM_TO_POINT( 20.0 );
- tqlayout.ptRight = MM_TO_POINT( 20.0 );
- tqlayout.ptTop = MM_TO_POINT( 20.0 );
- tqlayout.ptBottom = MM_TO_POINT( 20.0 );
- tqlayout.ptPageEdge = -1;
- tqlayout.ptBindingSide = -1;
- return tqlayout;
+ KoPageLayout layout;
+ layout.format = KoPageFormat::defaultFormat();
+ layout.orientation = PG_PORTRAIT;
+ layout.ptWidth = MM_TO_POINT( KoPageFormat::width( layout.format, layout.orientation ) );
+ layout.ptHeight = MM_TO_POINT( KoPageFormat::height( layout.format, layout.orientation ) );
+ layout.ptLeft = MM_TO_POINT( 20.0 );
+ layout.ptRight = MM_TO_POINT( 20.0 );
+ layout.ptTop = MM_TO_POINT( 20.0 );
+ layout.ptBottom = MM_TO_POINT( 20.0 );
+ layout.ptPageEdge = -1;
+ layout.ptBindingSide = -1;
+ return layout;
}
struct PageFormatInfo
@@ -149,12 +149,12 @@ int KoPageFormat::printerPageSize( KoFormat format )
{
if ( format == PG_SCREEN )
{
- kdWarning() << "You use the page tqlayout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
+ kdWarning() << "You use the page layout SCREEN. Printing in DIN A4 LANDSCAPE." << endl;
return KPrinter::A4;
}
else if ( format == PG_CUSTOM )
{
- kdWarning() << "The used page tqlayout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
+ kdWarning() << "The used page layout (CUSTOM) is not supported by KPrinter. Printing in A4." << endl;
return KPrinter::A4;
}
else if ( format <= PG_LAST_FORMAT )
diff --git a/lib/kofficecore/KoPageLayout.h b/lib/kofficecore/KoPageLayout.h
index 4d4dc6cc..f854b1eb 100644
--- a/lib/kofficecore/KoPageLayout.h
+++ b/lib/kofficecore/KoPageLayout.h
@@ -154,7 +154,7 @@ enum KoHFType {
};
/**
- * This structure defines the page tqlayout, including
+ * This structure defines the page layout, including
* its size in pt, its format (e.g. A4), orientation, unit, margins etc.
*/
struct KoPageLayout
@@ -194,17 +194,17 @@ struct KoPageLayout
}
/**
- * Save this page tqlayout to OASIS.
+ * Save this page layout to OASIS.
*/
KOFFICECORE_EXPORT KoGenStyle saveOasis() const;
/**
- * Load this page tqlayout from OASIS
+ * Load this page layout from OASIS
*/
KOFFICECORE_EXPORT void loadOasis(const TQDomElement &style);
/**
- * @return a page tqlayout with the default page size depending on the locale settings,
+ * @return a page layout with the default page size depending on the locale settings,
* default margins (2 cm), and portrait orientation.
* @since 1.4
*/
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 259c498e..634a1393 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -342,7 +342,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event )
d->m_children.append( viewChild );
TQApplication::setOverrideCursor(waitCursor);
- // This is the long operation (due to toolbar tqlayout stuff)
+ // This is the long operation (due to toolbar layout stuff)
d->m_manager->setActivePart( child->document(), viewChild->frame()->view() );
TQApplication::restoreOverrideCursor();
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index 4a838726..0b64d5eb 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -58,7 +58,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<grid>
<property name="name">
diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui
index bfd4d49e..9e100ed2 100644
--- a/lib/kofficecore/koDocumentInfoAboutWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout8</cstring>
+ <cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@@ -67,7 +67,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<grid>
<property name="name">
@@ -96,7 +96,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<vbox>
<property name="name">
@@ -173,7 +173,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout11</cstring>
+ <cstring>layout11</cstring>
</property>
<grid>
<property name="name">
diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
index e007e1a2..bce29446 100644
--- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
@@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -61,7 +61,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<grid>
<property name="name">
@@ -227,7 +227,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index d97a33f2..bc650f10 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -26,7 +26,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index a85ecb38..c0076afa 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -25,7 +25,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<vbox>
<property name="name">
@@ -71,7 +71,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<vbox>
<property name="name">
diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index 512dec71..af2bc696 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -1419,9 +1419,9 @@ void testSimpleOpenDocumentPresentation()
xmlstream << " <office:presentation>";
xmlstream << " <draw:page draw:name=\"Title\" draw:style-name=\"dp1\" ";
xmlstream << " draw:master-page-name=\"lyt-cool\" ";
- xmlstream << " presentation:presentation-page-tqlayout-name=\"AL1T0\">";
+ xmlstream << " presentation:presentation-page-layout-name=\"AL1T0\">";
xmlstream << " <draw:frame presentation:style-name=\"pr1\" ";
- xmlstream << " draw:text-style-name=\"P2\" draw:layer=\"tqlayout\" ";
+ xmlstream << " draw:text-style-name=\"P2\" draw:layer=\"layout\" ";
xmlstream << " svg:width=\"23.912cm\" svg:height=\"3.508cm\" ";
xmlstream << " svg:x=\"2.058cm\" svg:y=\"1.543cm\" ";
xmlstream << " presentation:class=\"title\" ";
@@ -1431,7 +1431,7 @@ void testSimpleOpenDocumentPresentation()
xmlstream << " </draw:text-box>";
xmlstream << " </draw:frame>";
xmlstream << " <draw:frame presentation:style-name=\"pr2\" ";
- xmlstream << " draw:text-style-name=\"P3\" draw:layer=\"tqlayout\"";
+ xmlstream << " draw:text-style-name=\"P3\" draw:layer=\"layout\"";
xmlstream << " svg:width=\"23.912cm\" svg:height=\"13.231cm\"";
xmlstream << " svg:x=\"2.058cm\" svg:y=\"5.838cm\" ";
xmlstream << " presentation:class=\"subtitle\">";
@@ -1440,8 +1440,8 @@ void testSimpleOpenDocumentPresentation()
xmlstream << " </draw:text-box>";
xmlstream << " </draw:frame>";
xmlstream << " <presentation:notes draw:style-name=\"dp2\">";
- xmlstream << " <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"tqlayout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
- xmlstream << " <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"tqlayout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
+ xmlstream << " <draw:page-thumbnail draw:style-name=\"gr1\" draw:layer=\"layout\" svg:width=\"13.706cm\" svg:height=\"10.28cm\" svg:x=\"3.647cm\" svg:y=\"2.853cm\" draw:page-number=\"1\" presentation:class=\"page\"/>";
+ xmlstream << " <draw:frame presentation:style-name=\"pr3\" draw:text-style-name=\"P1\" draw:layer=\"layout\" svg:width=\"14.518cm\" svg:height=\"11.411cm\" svg:x=\"3.249cm\" svg:y=\"14.13cm\" presentation:class=\"notes\" presentation:placeholder=\"true\">";
xmlstream << " <draw:text-box/>";
xmlstream << " </draw:frame>";
xmlstream << " </presentation:notes>";
@@ -1587,7 +1587,7 @@ void testSimpleOpenDocumentPresentation()
CHECK( titlePageElement.attributeNS(drawNS,"style-name",""), TQString("dp1") );
CHECK( titlePageElement.attributeNS(drawNS,"master-page-name",""), TQString("lyt-cool") );
CHECK( titlePageElement.attributeNS(presentationNS,
- "presentation-page-tqlayout-name",""), TQString("AL1T0") );
+ "presentation-page-layout-name",""), TQString("AL1T0") );
// <draw:frame> for the title frame
KoXmlElement titleFrameElement;
@@ -1605,7 +1605,7 @@ void testSimpleOpenDocumentPresentation()
CHECK( titleFrameElement.attributeNS(presentationNS,"class",""), TQString("title") );
CHECK( titleFrameElement.attributeNS(presentationNS,"user-transformed",""), TQString("true") );
CHECK( titleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P2") );
- CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
+ CHECK( titleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
CHECK( titleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
CHECK( titleFrameElement.attributeNS(svgNS,"height",""), TQString("3.508cm") );
CHECK( titleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
@@ -1655,7 +1655,7 @@ void testSimpleOpenDocumentPresentation()
CHECK( subtitleFrameElement.attributeNS(presentationNS,"class",""), TQString("subtitle") );
CHECK( subtitleFrameElement.hasAttributeNS(presentationNS,"user-transformed"), false );
CHECK( subtitleFrameElement.attributeNS(drawNS,"text-style-name",""), TQString("P3") );
- CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("tqlayout") );
+ CHECK( subtitleFrameElement.attributeNS(drawNS,"layer",""), TQString("layout") );
CHECK( subtitleFrameElement.attributeNS(svgNS,"width",""), TQString("23.912cm") );
CHECK( subtitleFrameElement.attributeNS(svgNS,"height",""), TQString("13.231cm") );
CHECK( subtitleFrameElement.attributeNS(svgNS,"x",""), TQString("2.058cm") );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-15 08:35:07 +0000