1. mst
  2. ooo340

Commits

hr  committed 29e2520

#i10000#: fix link problems due to CWS frmdlg

  • Participants
  • Parent commits 26536ad
  • Branches default

Comments (0)

Files changed (3)

File sc/inc/externalrefmgr.hxx

View file
  • Ignore whitespace
 
 // ============================================================================
 
-class ScExternalRefManager : public formula::ExternalReferenceHelper
+class SC_DLLPUBLIC ScExternalRefManager : public formula::ExternalReferenceHelper
 {
 public:
 

File sc/source/filter/xml/xmlimprt.cxx

View file
  • Ignore whitespace
     return (cppu::OWeakObject*)new ScXMLImport( rSMgr, IMPORT_SETTINGS );
 }
 
+const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap()
+{
+    static __FAR_DATA SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] =
+    {
+        { XML_NAMESPACE_TABLE,  XML_STYLE_NAME,                     XML_TOK_TABLE_ROW_CELL_ATTR_STYLE_NAME              },
+        { XML_NAMESPACE_TABLE,  XML_CONTENT_VALIDATION_NAME,        XML_TOK_TABLE_ROW_CELL_ATTR_CONTENT_VALIDATION_NAME },
+        { XML_NAMESPACE_TABLE,  XML_NUMBER_ROWS_SPANNED,            XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_ROWS            },
+        { XML_NAMESPACE_TABLE,  XML_NUMBER_COLUMNS_SPANNED,         XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_COLS            },
+        { XML_NAMESPACE_TABLE,  XML_NUMBER_MATRIX_COLUMNS_SPANNED,  XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_COLS     },
+        { XML_NAMESPACE_TABLE,  XML_NUMBER_MATRIX_ROWS_SPANNED,     XML_TOK_TABLE_ROW_CELL_ATTR_SPANNED_MATRIX_ROWS     },
+        { XML_NAMESPACE_TABLE,  XML_NUMBER_COLUMNS_REPEATED,        XML_TOK_TABLE_ROW_CELL_ATTR_REPEATED                },
+        { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE,                     XML_TOK_TABLE_ROW_CELL_ATTR_VALUE_TYPE              },
+        { XML_NAMESPACE_OFFICE, XML_VALUE,                          XML_TOK_TABLE_ROW_CELL_ATTR_VALUE                   },
+        { XML_NAMESPACE_OFFICE, XML_DATE_VALUE,                     XML_TOK_TABLE_ROW_CELL_ATTR_DATE_VALUE              },
+        { XML_NAMESPACE_OFFICE, XML_TIME_VALUE,                     XML_TOK_TABLE_ROW_CELL_ATTR_TIME_VALUE              },
+        { XML_NAMESPACE_OFFICE, XML_STRING_VALUE,                   XML_TOK_TABLE_ROW_CELL_ATTR_STRING_VALUE            },
+        { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE,                  XML_TOK_TABLE_ROW_CELL_ATTR_BOOLEAN_VALUE           },
+        { XML_NAMESPACE_TABLE,  XML_FORMULA,                        XML_TOK_TABLE_ROW_CELL_ATTR_FORMULA                 },
+        { XML_NAMESPACE_OFFICE, XML_CURRENCY,                       XML_TOK_TABLE_ROW_CELL_ATTR_CURRENCY                },
+        XML_TOKEN_MAP_END
+    };
+
+    if ( !pTableRowCellAttrTokenMap )
+        pTableRowCellAttrTokenMap = new SvXMLTokenMap( aTableRowCellAttrTokenMap );
+    return *pTableRowCellAttrTokenMap;
+}
+
 //----------------------------------------------------------------------------
 
 

File sc/util/makefile.mk

View file
  • Ignore whitespace
 	$(SOTLIB)		\
 	$(XMLOFFLIB)	\
 	$(DBTOOLSLIB)	\
-	$(AVMEDIALIB)
+	$(AVMEDIALIB) \
+	$(FORLIB) \
+    $(FORUILIB)
 	
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL1STDLIBS+= \
-		-lfor$(DLLPOSTFIX) \
-		-lforui$(DLLPOSTFIX)
-.ELSE
-SHL1STDLIBS+= \
-		ifor.lib \
-		iforui.lib
-.ENDIF
-
-
 SHL1LIBS=$(LIB3TARGET) $(LIB4TARGET)
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 	$(DBTOOLSLIB)	\
 	$(AVMEDIALIB)   \
 	$(OOXLIB)       \
-	$(SAXLIB)
+	$(SAXLIB) \
+    $(FORLIB)
 
 # add for scui
 SHL8TARGET= scui$(DLLPOSTFIX)
 		$(ISCLIB) \
         $(VCLLIB) \
         $(TKLIB) \
-
-
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL9STDLIBS+= \
-		-lfor$(DLLPOSTFIX)
-.ELSE
-SHL9STDLIBS+= \
-		ifor.lib
-.ENDIF
+        $(FORLIB)
 
 SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
 SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib